From 56bbfcfa80014f60f5441cc0c347056c5c53d866 Mon Sep 17 00:00:00 2001 From: "binbin.zhang" Date: Sat, 6 Aug 2022 20:32:48 +0800 Subject: [PATCH] refine log stdout (#498) --- clients/config_client/config_client.go | 2 +- clients/naming_client/naming_client.go | 2 +- common/constant/client_config_options.go | 2 +- common/constant/config.go | 2 +- example/config/main.go | 2 +- example/service/main.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clients/config_client/config_client.go b/clients/config_client/config_client.go index 6f6a7d53..b144f393 100644 --- a/clients/config_client/config_client.go +++ b/clients/config_client/config_client.go @@ -103,7 +103,7 @@ func NewConfigClient(nc nacos_client.INacosClient) (*ConfigClient, error) { LogRollingConfig: clientConfig.LogRollingConfig, LogDir: clientConfig.LogDir, CustomLogger: clientConfig.CustomLogger, - LogStdout: clientConfig.LogStdout, + LogStdout: clientConfig.AppendToStdout, } err = logger.InitLogger(loggerConfig) if err != nil { diff --git a/clients/naming_client/naming_client.go b/clients/naming_client/naming_client.go index 5eb1ec6c..c1794889 100644 --- a/clients/naming_client/naming_client.go +++ b/clients/naming_client/naming_client.go @@ -74,7 +74,7 @@ func NewNamingClient(nc nacos_client.INacosClient) (NamingClient, error) { LogRollingConfig: clientConfig.LogRollingConfig, LogDir: clientConfig.LogDir, CustomLogger: clientConfig.CustomLogger, - LogStdout: clientConfig.LogStdout, + LogStdout: clientConfig.AppendToStdout, } err = logger.InitLogger(loggerConfig) if err != nil { diff --git a/common/constant/client_config_options.go b/common/constant/client_config_options.go index 5e6dd84a..a64d296c 100644 --- a/common/constant/client_config_options.go +++ b/common/constant/client_config_options.go @@ -184,6 +184,6 @@ func WithLogRollingConfig(rollingConfig *lumberjack.Logger) ClientOption { // WithLogStdout ... func WithLogStdout(logStdout bool) ClientOption { return func(config *ClientConfig) { - config.LogStdout = logStdout + config.AppendToStdout = logStdout } } diff --git a/common/constant/config.go b/common/constant/config.go index 14150a90..4c0ae453 100644 --- a/common/constant/config.go +++ b/common/constant/config.go @@ -52,5 +52,5 @@ type ClientConfig struct { ContextPath string // the nacos server contextpath LogRollingConfig *lumberjack.Logger // the log rolling config CustomLogger logger.Logger // the custom log interface ,With a custom Logger (nacos sdk will not provide log cutting and archiving capabilities) - LogStdout bool // the stdout redirect for log, default is false + AppendToStdout bool // append log to stdout } diff --git a/example/config/main.go b/example/config/main.go index ebbe77c1..6a7ff38c 100644 --- a/example/config/main.go +++ b/example/config/main.go @@ -48,7 +48,7 @@ func main() { LogDir: "/tmp/nacos/log", CacheDir: "/tmp/nacos/cache", LogLevel: "debug", - LogStdout: true, + AppendToStdout: true, } //or a more graceful way to create ClientConfig _ = *constant.NewClientConfig( diff --git a/example/service/main.go b/example/service/main.go index f1b3dc50..664ccbe7 100644 --- a/example/service/main.go +++ b/example/service/main.go @@ -48,7 +48,7 @@ func main() { CacheDir: "/tmp/nacos/cache", LogRollingConfig: &lumberjack.Logger{MaxSize: 10}, LogLevel: "debug", - LogStdout: true, + AppendToStdout: true, } //or a more graceful way to create ClientConfig _ = *constant.NewClientConfig(