diff --git a/log/global.go b/log/global.go index ab993ba08..c3dc292c2 100644 --- a/log/global.go +++ b/log/global.go @@ -1,15 +1,11 @@ package log import ( - "fmt" - "os" "sync" ) // globalLogger is designed as a global logger in current process. -var ( - global = &loggerAppliance{} -) +var global = &loggerAppliance{} type loggerAppliance struct { lock sync.Mutex @@ -38,89 +34,87 @@ func SetLogger(logger Logger) { global.SetLogger(logger) } +// GetLogger returns global logger in current process. func GetLogger() Logger { return global.GetLogger() } // Log Print log by level and keyvals. func Log(level Level, keyvals ...interface{}) { - _ = global.logger.Log(level, keyvals...) + global.helper.Log(level, keyvals...) } // Debug logs a message at debug level. func Debug(a ...interface{}) { - global.helper.Log(LevelDebug, global.helper.msgKey, fmt.Sprint(a...)) + global.helper.Debug(a...) } // Debugf logs a message at debug level. func Debugf(format string, a ...interface{}) { - global.helper.Log(LevelDebug, global.helper.msgKey, fmt.Sprintf(format, a...)) + global.helper.Debugf(format, a...) } // Debugw logs a message at debug level. func Debugw(keyvals ...interface{}) { - global.helper.Log(LevelDebug, keyvals...) + global.helper.Debugw(keyvals...) } // Info logs a message at info level. func Info(a ...interface{}) { - global.helper.Log(LevelInfo, global.helper.msgKey, fmt.Sprint(a...)) + global.helper.Info(a...) } // Infof logs a message at info level. func Infof(format string, a ...interface{}) { - global.helper.Log(LevelInfo, global.helper.msgKey, fmt.Sprintf(format, a...)) + global.helper.Infof(format, a...) } // Infow logs a message at info level. func Infow(keyvals ...interface{}) { - global.helper.Log(LevelInfo, keyvals...) + global.helper.Infow(keyvals...) } // Warn logs a message at warn level. func Warn(a ...interface{}) { - global.helper.Log(LevelWarn, global.helper.msgKey, fmt.Sprint(a...)) + global.helper.Warn(a...) } // Warnf logs a message at warnf level. func Warnf(format string, a ...interface{}) { - global.helper.Log(LevelWarn, global.helper.msgKey, fmt.Sprintf(format, a...)) + global.helper.Warnf(format, a...) } // Warnw logs a message at warnf level. func Warnw(keyvals ...interface{}) { - global.helper.Log(LevelWarn, keyvals...) + global.helper.Warnw(keyvals...) } // Error logs a message at error level. func Error(a ...interface{}) { - global.helper.Log(LevelError, global.helper.msgKey, fmt.Sprint(a...)) + global.helper.Error(a...) } // Errorf logs a message at error level. func Errorf(format string, a ...interface{}) { - global.helper.Log(LevelError, global.helper.msgKey, fmt.Sprintf(format, a...)) + global.helper.Errorf(format, a...) } // Errorw logs a message at error level. func Errorw(keyvals ...interface{}) { - global.helper.Log(LevelError, keyvals...) + global.helper.Errorw(keyvals...) } // Fatal logs a message at fatal level. func Fatal(a ...interface{}) { - global.helper.Log(LevelFatal, global.helper.msgKey, fmt.Sprint(a...)) - os.Exit(1) + global.helper.Fatal(a...) } // Fatalf logs a message at fatal level. func Fatalf(format string, a ...interface{}) { - global.helper.Log(LevelFatal, global.helper.msgKey, fmt.Sprintf(format, a...)) - os.Exit(1) + global.helper.Fatalf(format, a...) } // Fatalw logs a message at fatal level. func Fatalw(keyvals ...interface{}) { - global.helper.Log(LevelFatal, keyvals...) - os.Exit(1) + global.helper.Fatalw(keyvals...) } diff --git a/transport/grpc/client.go b/transport/grpc/client.go index 13a28eff0..958347475 100644 --- a/transport/grpc/client.go +++ b/transport/grpc/client.go @@ -124,7 +124,7 @@ func dial(ctx context.Context, insecure bool, opts ...ClientOption) (*grpc.Clien options := clientOptions{ timeout: 2000 * time.Millisecond, balancerName: wrr.Name, - logger: log.DefaultLogger, + logger: log.GetLogger(), } for _, o := range opts { o(&options)