瀏覽代碼

pkg/logutil: change to "MergeOutputPaths"

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
Gyuho Lee 6 年之前
父節點
當前提交
41a2cfa122
共有 1 個文件被更改,包括 2 次插入8 次删除
  1. 2 8
      pkg/logutil/zap.go

+ 2 - 8
pkg/logutil/zap.go

@@ -53,15 +53,12 @@ var DefaultZapLoggerConfig = zap.Config{
 	ErrorOutputPaths: []string{"stderr"},
 	ErrorOutputPaths: []string{"stderr"},
 }
 }
 
 
-// AddOutputPaths adds output paths to the existing output paths, resolving conflicts.
-func AddOutputPaths(cfg zap.Config, outputPaths, errorOutputPaths []string) zap.Config {
+// MergeOutputPaths merges logging output paths, resolving conflicts.
+func MergeOutputPaths(cfg zap.Config) zap.Config {
 	outputs := make(map[string]struct{})
 	outputs := make(map[string]struct{})
 	for _, v := range cfg.OutputPaths {
 	for _, v := range cfg.OutputPaths {
 		outputs[v] = struct{}{}
 		outputs[v] = struct{}{}
 	}
 	}
-	for _, v := range outputPaths {
-		outputs[v] = struct{}{}
-	}
 	outputSlice := make([]string, 0)
 	outputSlice := make([]string, 0)
 	if _, ok := outputs["/dev/null"]; ok {
 	if _, ok := outputs["/dev/null"]; ok {
 		// "/dev/null" to discard all
 		// "/dev/null" to discard all
@@ -78,9 +75,6 @@ func AddOutputPaths(cfg zap.Config, outputPaths, errorOutputPaths []string) zap.
 	for _, v := range cfg.ErrorOutputPaths {
 	for _, v := range cfg.ErrorOutputPaths {
 		errOutputs[v] = struct{}{}
 		errOutputs[v] = struct{}{}
 	}
 	}
-	for _, v := range errorOutputPaths {
-		errOutputs[v] = struct{}{}
-	}
 	errOutputSlice := make([]string, 0)
 	errOutputSlice := make([]string, 0)
 	if _, ok := errOutputs["/dev/null"]; ok {
 	if _, ok := errOutputs["/dev/null"]; ok {
 		// "/dev/null" to discard all
 		// "/dev/null" to discard all