fix: configure klog and global logger to use zapr in json mode (kyver…

…no#5144) * configure klog and global logger to use zapr in json mode Signed-off-by: damilola olayinka <[email protected]> * changes Signed-off-by: damilola olayinka <[email protected]> * make zapr compatible with klog's -v argument Signed-off-by: damilola olayinka <[email protected]> * remove changes Signed-off-by: damilola olayinka <[email protected]> * remove logLevel flag Signed-off-by: damilola olayinka <[email protected]> Signed-off-by: damilola olayinka <[email protected]> Co-authored-by: shuting <[email protected]>
infracloudio · Oct 28, 2022 · 8a59e24 · 8a59e24
1 parent 1fef873
commit 8a59e24
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/pkg/logging/log.go b/pkg/logging/log.go
@@ -43,6 +43,7 @@ func Init(flags *flag.FlagSet) {
 
 // Setup configures the logger with the supplied log format.
 // It returns an error if the JSON logger could not be initialized or passed logFormat is not recognized.
+// LogLevel parameter is used to configure zap.
 func Setup(logFormat string) error {
 	switch logFormat {
 	case TextFormat:
@@ -53,9 +54,9 @@ func Setup(logFormat string) error {
 		if err != nil {
 			return err
 		}
-		klog.SetLogger(zapr.NewLogger(zapLog))
-		// in json mode we use FormatKlog format
-		globalLog = klog.NewKlogr()
+		globalLog = zapr.NewLogger(zapLog)
+		// in json mode we configure klog and global logger to use zapr
+		klog.SetLogger(globalLog.WithName("klog"))
 	default:
 		return errors.New("log format not recognized, pass `text` for text mode or `json` to enable JSON logging")
 	}