Skip to content

Normalize Fatal(f) logging calls in main files. #3866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow-robot merged 2 commits into from
Apr 24, 2019
Merged

Normalize Fatal(f) logging calls in main files. #3866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98136e8
Normalize Fatal(f) logging calls in main files.
markusthoemmes Apr 23, 2019
ed83695
One more occurrence.
markusthoemmes Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/activator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions cmd/autoscaler/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...)
Expand Down Expand Up @@ -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)
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cmd/networking/istio/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion cmd/queue/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
})

Expand Down
6 changes: 3 additions & 3 deletions cmd/webhook/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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.
Expand Down