From 73bea99c34ed576a899db441d9989eeb3c0d6076 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 25 Feb 2021 18:15:17 +0200 Subject: [PATCH 1/2] nfd-master: drop last remnants of log package --- cmd/nfd-master/main.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/nfd-master/main.go b/cmd/nfd-master/main.go index 18857c11b..96725be97 100644 --- a/cmd/nfd-master/main.go +++ b/cmd/nfd-master/main.go @@ -19,7 +19,6 @@ package main import ( "flag" "fmt" - "log" "os" "regexp" @@ -58,17 +57,17 @@ func main() { // Assert that the version is known if version.Undefined() { - log.Print("WARNING: version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always`\" during build or run.") + klog.Warningf("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always`\" during build or run.") } // Get new NfdMaster instance instance, err := master.NewNfdMaster(args) if err != nil { - log.Fatalf("Failed to initialize NfdMaster instance: %v", err) + klog.Exitf("Failed to initialize NfdMaster instance: %v", err) } if err = instance.Run(); err != nil { - log.Fatalf("ERROR: %v", err) + klog.Exit(err) } } From ed722d5527b62a042dce42687cb2cf1bc50ef8fa Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 25 Feb 2021 18:23:47 +0200 Subject: [PATCH 2/2] nfd-worker: change Fatal* log messages to Exit* We don't want to always print backtraces. --- cmd/nfd-worker/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/nfd-worker/main.go b/cmd/nfd-worker/main.go index b3575e242..bc3314455 100644 --- a/cmd/nfd-worker/main.go +++ b/cmd/nfd-worker/main.go @@ -54,11 +54,11 @@ func main() { // Get new NfdWorker instance instance, err := worker.NewNfdWorker(args) if err != nil { - klog.Fatalf("Failed to initialize NfdWorker instance: %v", err) + klog.Exitf("Failed to initialize NfdWorker instance: %v", err) } if err = instance.Run(); err != nil { - klog.Fatal(err) + klog.Exit(err) } }