wip

Signed-off-by: Armando Ruocco <[email protected]>

Author: armru

pkg/log/flags.go

@@ -81,12 +81,17 @@ func GetFieldsRemapFlags() (res []string) {
 	return res
 }
 
-func (l *Flags) BuildLogger() logr.Logger {
-	if l.zapOptions.TimeEncoder == nil {
-		l.zapOptions.TimeEncoder = zapcore.RFC3339NanoTimeEncoder
+// GetOptions returns the zap options
+func (l *Flags) GetOptions() zap.Options {
+	return l.zapOptions
+}
+
+func BuildLogger(options zap.Options) logr.Logger {
+	if options.TimeEncoder == nil {
+		options.TimeEncoder = zapcore.RFC3339NanoTimeEncoder
 	}
 
-	lgr := zap.New(zap.UseFlagOptions(&l.zapOptions), customLevel, customDestination, remapKeys)
+	lgr := zap.New(zap.UseFlagOptions(&options), customLevel, customDestination, remapKeys)
 	switch logLevel {
 	case ErrorLevelString,
 		WarningLevelString,
@@ -105,7 +110,7 @@ func (l *Flags) BuildLogger() logr.Logger {
 // passed from the user
 // This is executed after args were already parsed.
 func (l *Flags) ConfigureLogging() {
-	lgr := l.BuildLogger()
+	lgr := BuildLogger(l.zapOptions)
 	SetGlobalLogger(lgr)
 }
 
@@ -117,7 +122,8 @@ func SetGlobalLogger(lgr logr.Logger) {
 	SetLogger(lgr)
 }
 
-func getLogLevel(l string) zapcore.Level {
+// GetLogLevel returns the zap log level from a string
+func GetLogLevel(l string) zapcore.Level {
 	switch l {
 	case ErrorLevelString:
 		return ErrorLevel
@@ -163,7 +169,7 @@ func remapKeys(in *zap.Options) {
 }
 
 func customLevel(in *zap.Options) {
-	in.Level = getLogLevel(logLevel)
+	in.Level = GetLogLevel(logLevel)
 	in.EncoderConfigOptions = append(in.EncoderConfigOptions, func(c *zapcore.EncoderConfig) {
 		c.EncodeLevel = func(l zapcore.Level, enc zapcore.PrimitiveArrayEncoder) {
 			enc.AppendString(getLogLevelString(l))