From 92788e4cf4aa5fc7c42227642f206482fccecaf1 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 26 Feb 2024 01:33:48 -0800 Subject: [PATCH] fix: re-arrange console-sys to log properly in k8s/docker (#19129) fixes #19125 --- cmd/endpoint.go | 9 +-------- cmd/server-main.go | 18 +++++++++--------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/cmd/endpoint.go b/cmd/endpoint.go index e4e80d074..82b17e43b 100644 --- a/cmd/endpoint.go +++ b/cmd/endpoint.go @@ -567,13 +567,6 @@ func (endpoints Endpoints) GetAllStrings() (all []string) { func hostResolveToLocalhost(endpoint Endpoint) bool { hostIPs, err := getHostIP(endpoint.Hostname()) if err != nil { - // Log the message to console about the host resolving - reqInfo := (&logger.ReqInfo{}).AppendTags( - "host", - endpoint.Hostname(), - ) - ctx := logger.SetReqInfo(GlobalContext, reqInfo) - logger.LogOnceIf(ctx, err, endpoint.Hostname(), logger.ErrorKind) return false } var loopback int @@ -867,7 +860,7 @@ func (p PoolEndpointList) UpdateIsLocal() error { )) ctx := logger.SetReqInfo(GlobalContext, reqInfo) - logger.LogOnceIf(ctx, err, endpoint.Hostname(), logger.ErrorKind) + logger.LogOnceIf(ctx, fmt.Errorf("Unable to resolve DNS for %s: %w", endpoint, err), endpoint.Hostname(), logger.ErrorKind) } } else { resolvedList[endpoint] = true diff --git a/cmd/server-main.go b/cmd/server-main.go index 6066e219b..9001dc02b 100644 --- a/cmd/server-main.go +++ b/cmd/server-main.go @@ -651,6 +651,15 @@ func serverMain(ctx *cli.Context) { setDefaultProfilerRates() + // Initialize globalConsoleSys system + bootstrapTrace("newConsoleLogger", func() { + globalConsoleSys = NewConsoleLogger(GlobalContext) + logger.AddSystemTarget(GlobalContext, globalConsoleSys) + + // Set node name, only set for distributed setup. + globalConsoleSys.SetNodeName(globalLocalNodeName) + }) + // Always load ENV variables from files first. loadEnvVarsFromFiles() @@ -672,15 +681,6 @@ func serverMain(ctx *cli.Context) { // the config file if not defined, set the default one. loadRootCredentials() - // Initialize globalConsoleSys system - bootstrapTrace("newConsoleLogger", func() { - globalConsoleSys = NewConsoleLogger(GlobalContext) - logger.AddSystemTarget(GlobalContext, globalConsoleSys) - - // Set node name, only set for distributed setup. - globalConsoleSys.SetNodeName(globalLocalNodeName) - }) - // Perform any self-tests bootstrapTrace("selftests", func() { bitrotSelfTest()