cmd/cli: use warn level for network changes logging

So these events will be recorded separately from normal runtime log,
making troubleshooting later more easily.

While at it, only update ctrld.ProxyLogger for runCmd, it's the only one
which needs to log the query when proxying requests.
This commit is contained in:
Cuong Manh Le authored and Cuong Manh Le committed 2025-02-05 13:14:39 +07:00
1 parent f57972ead7
commit eb27d1482b
3 files changed
+9 -9

No files matched your search

+2
View File
@@ -267,6 +267,8 @@ func run(appCallback *AppCallback, stopCh chan struct{}) {
// Log config do not have thing to validate, so it's safe to init log here, // Log config do not have thing to validate, so it's safe to init log here,
// so it's able to log information in processCDFlags. // so it's able to log information in processCDFlags.
logWriters := initLogging() logWriters := initLogging()
// TODO: find a better way.
ctrld.ProxyLogger.Store(mainLog.Load())
// Initializing internal logging after global logging. // Initializing internal logging after global logging.
p.initInternalLogging(logWriters) p.initInternalLogging(logWriters)
+7 -7
View File
@@ -1251,7 +1251,7 @@ func (p *prog) reinitializeOSResolver(networkChange bool) {
defer func() { defer func() {
// start leaking queries immediately // start leaking queries immediately
if networkChange { if networkChange {
// set all upstreams to fialed and provide to performLeakingQuery // set all upstreams to failed and provide to performLeakingQuery
failedUpstreams := make(map[string]*ctrld.UpstreamConfig) failedUpstreams := make(map[string]*ctrld.UpstreamConfig)
for _, upstream := range p.cfg.Upstream { for _, upstream := range p.cfg.Upstream {
failedUpstreams[upstream.Name] = upstream failedUpstreams[upstream.Name] = upstream
@@ -1280,7 +1280,7 @@ func (p *prog) reinitializeOSResolver(networkChange bool) {
default: default:
mainLog.Load().Debug().Msg("initializing OS resolver") mainLog.Load().Debug().Msg("initializing OS resolver")
ns := ctrld.InitializeOsResolver() ns := ctrld.InitializeOsResolver()
mainLog.Load().Debug().Msgf("re-initialized OS resolver with nameservers: %v", ns) mainLog.Load().Warn().Msgf("re-initialized OS resolver with nameservers: %v", ns)
} }
select { select {
@@ -1352,7 +1352,7 @@ func (p *prog) monitorNetworkChanges() error {
validIfaces := validInterfacesMap() validIfaces := validInterfacesMap()
// log the delta for debugging // log the delta for debugging
mainLog.Load().Debug(). mainLog.Load().Warn().
Interface("old_state", delta.Old). Interface("old_state", delta.Old).
Interface("new_state", delta.New). Interface("new_state", delta.New).
Msg("Network change detected") Msg("Network change detected")
@@ -1376,14 +1376,14 @@ func (p *prog) monitorNetworkChanges() error {
// Compare states directly // Compare states directly
if oldExists != newExists || oldState != newState { if oldExists != newExists || oldState != newState {
changed = true changed = true
mainLog.Load().Debug(). mainLog.Load().Warn().
Str("interface", ifaceName). Str("interface", ifaceName).
Str("old_state", oldState). Str("old_state", oldState).
Str("new_state", newState). Str("new_state", newState).
Msg("Valid interface changed state") Msg("Valid interface changed state")
break break
} else { } else {
mainLog.Load().Debug(). mainLog.Load().Warn().
Str("interface", ifaceName). Str("interface", ifaceName).
Str("old_state", oldState). Str("old_state", oldState).
Str("new_state", newState). Str("new_state", newState).
@@ -1392,14 +1392,14 @@ func (p *prog) monitorNetworkChanges() error {
} }
if !changed { if !changed {
mainLog.Load().Debug().Msg("Ignoring interface change - no valid interfaces affected") mainLog.Load().Warn().Msg("Ignoring interface change - no valid interfaces affected")
return return
} }
if activeInterfaceExists { if activeInterfaceExists {
p.reinitializeOSResolver(true) p.reinitializeOSResolver(true)
} else { } else {
mainLog.Load().Debug().Msg("No active interfaces found, skipping reinitialization") mainLog.Load().Warn().Msg("No active interfaces found, skipping reinitialization")
} }
}) })
-2
View File
@@ -143,8 +143,6 @@ func initLoggingWithBackup(doBackup bool) []io.Writer {
multi := zerolog.MultiLevelWriter(writers...) multi := zerolog.MultiLevelWriter(writers...)
l := mainLog.Load().Output(multi).With().Logger() l := mainLog.Load().Output(multi).With().Logger()
mainLog.Store(&l) mainLog.Store(&l)
// TODO: find a better way.
ctrld.ProxyLogger.Store(&l)
zerolog.SetGlobalLevel(zerolog.NoticeLevel) zerolog.SetGlobalLevel(zerolog.NoticeLevel)
logLevel := cfg.Service.LogLevel logLevel := cfg.Service.LogLevel