[dubbo-go] branch config-enhance updated: Fix: no log output error (#1434)

[la...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

laurence pushed a commit to branch config-enhance
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git


The following commit(s) were added to refs/heads/config-enhance by this push:
     new 2e0b0e4  Fix: no log output error (#1434)
2e0b0e4 is described below

commit 2e0b0e42d9b826d7e382302b6b33cc98e1c141d3
Author: 氕氘氚 <cj...@163.com>
AuthorDate: Fri Sep 3 23:20:25 2021 +0800

    Fix: no log output error (#1434)
    
    * fix logger panic
    
    * fix OutputPaths null error
    
    * test: add test for OutputPaths & mod imports
---
 config/logger_config.go      | 10 ++++++++++
 config/logger_config_test.go |  1 +
 2 files changed, 11 insertions(+)

diff --git a/config/logger_config.go b/config/logger_config.go
index 4e0ed16..d8f939c 100644
--- a/config/logger_config.go
+++ b/config/logger_config.go
@@ -24,6 +24,7 @@ import (
 import (
 	"github.com/creasty/defaults"
 	"github.com/natefinch/lumberjack"
+	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
 
@@ -86,6 +87,7 @@ func initLoggerConfig(rc *RootConfig) error {
 	if err != nil {
 		return err
 	}
+	logConfig.ZapConfig.setZapConfig(logConf.ZapConfig)
 	logger.InitLogger(logConf)
 	return nil
 }
@@ -97,6 +99,14 @@ func (l *LoggerConfig) check() error {
 	return verify(l)
 }
 
+func (e *ZapConfig) setZapConfig(config *zap.Config) {
+	config.OutputPaths = e.OutputPaths
+	config.ErrorOutputPaths = e.ErrorOutputPaths
+	config.DisableStacktrace = e.DisableStacktrace
+	config.DisableCaller = e.DisableCaller
+	config.InitialFields = e.InitialFields
+}
+
 func (e *EncoderConfig) setEncoderConfig(encoderConfig *zapcore.EncoderConfig) error {
 	encoderConfig.MessageKey = e.MessageKey
 	encoderConfig.LevelKey = e.LevelKey
diff --git a/config/logger_config_test.go b/config/logger_config_test.go
index 787de5c..faa96a7 100644
--- a/config/logger_config_test.go
+++ b/config/logger_config_test.go
@@ -37,6 +37,7 @@ func TestLoggerInit(t *testing.T) {
 		assert.NotNil(t, rootConfig)
 		loggerConfig := rootConfig.Logger
 		assert.NotNil(t, loggerConfig)
+		assert.Equal(t, []string{"stderr"}, loggerConfig.ZapConfig.OutputPaths)
 		logger.Info("hello")
 	})