From 98136e874d791b3726a6ccd2b8ebb2d7f14e0eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= Date: Tue, 23 Apr 2019 11:22:55 +0200 Subject: [PATCH 1/2] Normalize Fatal(f) logging calls in main files. --- cmd/activator/main.go | 6 +++--- cmd/autoscaler/main.go | 6 +++--- cmd/controller/main.go | 6 +++--- cmd/networking/istio/main.go | 4 ++-- cmd/webhook/main.go | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/activator/main.go b/cmd/activator/main.go index 8e697a8ddec8..ff87c9d5df3b 100644 --- a/cmd/activator/main.go +++ b/cmd/activator/main.go @@ -127,11 +127,11 @@ func main() { flag.Parse() cm, err := configmap.Load("/etc/config-logging") if err != nil { - log.Fatalf("Error loading logging configuration: %v", err) + log.Fatal("Error loading logging configuration:", err) } logConfig, err := logging.NewConfigFromMap(cm) if err != nil { - log.Fatalf("Error parsing logging configuration: %v", err) + log.Fatal("Error parsing logging configuration:", err) } createdLogger, atomicLevel := logging.NewLoggerFromConfig(logConfig, component) logger := createdLogger.With(zap.String(logkey.ControllerType, "activator")) @@ -189,7 +189,7 @@ func main() { endpointInformer.Informer(), serviceInformer.Informer(), sksInformer.Informer()); err != nil { - logger.Fatalf("Failed to start informers: %v", err) + logger.Fatalw("Failed to start informers", err) } params := queue.BreakerParams{QueueDepth: breakerQueueDepth, MaxConcurrency: breakerMaxConcurrency, InitialCapacity: 0} diff --git a/cmd/autoscaler/main.go b/cmd/autoscaler/main.go index 9eb1444161c7..24e5d4552731 100644 --- a/cmd/autoscaler/main.go +++ b/cmd/autoscaler/main.go @@ -123,7 +123,7 @@ func main() { serviceInformer.Informer(), sksInformer.Informer(), ); err != nil { - logger.Fatalf("Failed to start informers: %v", err) + logger.Fatalw("Failed to start informers", err) } go controller.StartAll(stopCh, controllers...) @@ -162,11 +162,11 @@ func main() { func setupLogger() (*zap.SugaredLogger, zap.AtomicLevel) { loggingConfigMap, err := configmap.Load("/etc/config-logging") if err != nil { - log.Fatalf("Error loading logging configuration: %v", err) + log.Fatal("Error loading logging configuration:", err) } loggingConfig, err := logging.NewConfigFromMap(loggingConfigMap) if err != nil { - log.Fatalf("Error parsing logging configuration: %v", err) + log.Fatal("Error parsing logging configuration:", err) } return logging.NewLoggerFromConfig(loggingConfig, component) } diff --git a/cmd/controller/main.go b/cmd/controller/main.go index eea124a18a5a..348c4e6ecf2f 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -60,11 +60,11 @@ func main() { // Set up our logger. loggingConfigMap, err := configmap.Load("/etc/config-logging") if err != nil { - log.Fatalf("Error loading logging configuration: %v", err) + log.Fatal("Error loading logging configuration:", err) } loggingConfig, err := logging.NewConfigFromMap(loggingConfigMap) if err != nil { - log.Fatalf("Error parsing logging configuration: %v", err) + log.Fatal("Error parsing logging configuration:", err) } logger, atomicLevel := logging.NewLoggerFromConfig(loggingConfig, component) defer flush(logger) @@ -176,7 +176,7 @@ func main() { serviceInformer.Informer(), sksInformer.Informer(), ); err != nil { - logger.Fatalf("Failed to start informers: %v", err) + logger.Fatalw("Failed to start informers", err) } // Start all of the controllers. diff --git a/cmd/networking/istio/main.go b/cmd/networking/istio/main.go index d55480ac6d70..606dc2dd36e0 100644 --- a/cmd/networking/istio/main.go +++ b/cmd/networking/istio/main.go @@ -50,11 +50,11 @@ func main() { // Set up our logger. loggingConfigMap, err := configmap.Load("/etc/config-logging") if err != nil { - log.Fatalf("Error loading logging configuration: %v", err) + log.Fatal("Error loading logging configuration:", err) } loggingConfig, err := logging.NewConfigFromMap(loggingConfigMap) if err != nil { - log.Fatalf("Error parsing logging configuration: %v", err) + log.Fatal("Error parsing logging configuration:", err) } logger, atomicLevel := logging.NewLoggerFromConfig(loggingConfig, component) defer logger.Sync() diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go index 538d6482636e..178611cbcd6b 100644 --- a/cmd/webhook/main.go +++ b/cmd/webhook/main.go @@ -53,11 +53,11 @@ func main() { flag.Parse() cm, err := configmap.Load("/etc/config-logging") if err != nil { - log.Fatalf("Error loading logging configuration: %v", err) + log.Fatal("Error loading logging configuration:", err) } config, err := logging.NewConfigFromMap(cm) if err != nil { - log.Fatalf("Error parsing logging configuration: %v", err) + log.Fatal("Error parsing logging configuration:", err) } logger, atomicLevel := logging.NewLoggerFromConfig(config, component) defer logger.Sync() @@ -79,7 +79,7 @@ func main() { } if err := version.CheckMinimumVersion(kubeClient.Discovery()); err != nil { - logger.Fatalf("Version check failed: %v", err) + logger.Fatalw("Version check failed", err) } // Watch the logging config map and dynamically update logging levels. From ed8369543329bbf606e7b41656eacbb9d1a5de2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= Date: Tue, 23 Apr 2019 11:26:08 +0200 Subject: [PATCH 2/2] One more occurrence. --- cmd/queue/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/queue/main.go b/cmd/queue/main.go index 78765ad562e5..8cbce209fdae 100644 --- a/cmd/queue/main.go +++ b/cmd/queue/main.go @@ -305,7 +305,7 @@ func main() { // Calling server.Shutdown() allows pending requests to // complete, while no new work is accepted. if err := server.Shutdown(context.Background()); err != nil { - logger.Errorf("Failed to shutdown proxy server", zap.Error(err)) + logger.Errorw("Failed to shutdown proxy server", zap.Error(err)) } })