From 4f6043221c0778c940ccebcffb7fb1df16409d4e Mon Sep 17 00:00:00 2001 From: tinatwang Date: Wed, 19 Jan 2022 14:41:08 +0800 Subject: [PATCH 1/3] log config output, splite by --- conf.sample.yml | 2 +- dtmcli/logger/log.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.sample.yml b/conf.sample.yml index 9dabfc3..55ed6ff 100644 --- a/conf.sample.yml +++ b/conf.sample.yml @@ -50,7 +50,7 @@ # LogLevel: 'info' # default: info. can be debug|info|warn|error # Log: -# Outputs: 'stderr' # default: stderr, split by |, you can append files to Outputs if need. example:'stderr|/tmp/test.log' +# Outputs: '' # default: stderr, split by ",", you can append files to Outputs if need. example:'stdout,/tmp/test.log' # RotationEnable: 0 # default: 0 # RotationConfigJson: '{}' # example: '{"maxsize": 100, "maxage": 0, "maxbackups": 0, "localtime": false, "compress": false}' diff --git a/dtmcli/logger/log.go b/dtmcli/logger/log.go index 45048b1..dde58c1 100644 --- a/dtmcli/logger/log.go +++ b/dtmcli/logger/log.go @@ -49,7 +49,7 @@ func InitLog(level string) { // InitLog2 specify advanced log config func InitLog2(level string, outputs string, logRotationEnable int64, logRotateConfigJSON string) { - outputPaths := strings.Split(outputs, "|") + outputPaths := strings.Split(outputs, ",") for i, v := range outputPaths { if logRotationEnable != 0 && v != StdErr && v != StdOut { outputPaths[i] = fmt.Sprintf("lumberjack://%s", v) From b15f42062beef82ef2579b7f63deb10a494e9923 Mon Sep 17 00:00:00 2001 From: tinatwang Date: Wed, 19 Jan 2022 14:52:39 +0800 Subject: [PATCH 2/3] fix unittest for logger. --- dtmcli/logger/logger_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dtmcli/logger/logger_test.go b/dtmcli/logger/logger_test.go index 49035c2..d55b6d6 100644 --- a/dtmcli/logger/logger_test.go +++ b/dtmcli/logger/logger_test.go @@ -17,12 +17,12 @@ func TestInitLog(t *testing.T) { FatalfIf(false, "nothing") FatalIfError(nil) - InitLog2("debug", "test.log|stderr", 0, "") + InitLog2("debug", "test.log,stderr", 0, "") Debugf("a debug msg to console and file") - InitLog2("debug", "test2.log|/tmp/dtm-test1.log|/tmp/dtm-test.log|stdout|stderr", 1, + InitLog2("debug", "test2.log,/tmp/dtm-test1.log,/tmp/dtm-test.log,stdout,stderr", 1, "{\"maxsize\": 1, \"maxage\": 1, \"maxbackups\": 1, \"compress\": false}") - Debugf("a debug msg to /tmp/dtm-test.log|test2.log|stdout|stderr") + Debugf("a debug msg to /tmp/dtm-test.log and test2.log and stdout and stderr") // _ = os.Remove("test.log") } From d959d6be5536189bf6cc8b777c4080254789d506 Mon Sep 17 00:00:00 2001 From: tinatwang Date: Wed, 19 Jan 2022 16:28:44 +0800 Subject: [PATCH 3/3] optimize config example file. --- conf.sample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.sample.yml b/conf.sample.yml index 55ed6ff..13cf780 100644 --- a/conf.sample.yml +++ b/conf.sample.yml @@ -50,7 +50,7 @@ # LogLevel: 'info' # default: info. can be debug|info|warn|error # Log: -# Outputs: '' # default: stderr, split by ",", you can append files to Outputs if need. example:'stdout,/tmp/test.log' +# Outputs: 'stderr' # default: stderr, split by ",", you can append files to Outputs if need. example:'stderr,/tmp/test.log' # RotationEnable: 0 # default: 0 # RotationConfigJson: '{}' # example: '{"maxsize": 100, "maxage": 0, "maxbackups": 0, "localtime": false, "compress": false}'