Browse Source

embed: set log-outputs 'default' to 'stderr' config when zap mode

caoming 7 years ago
parent
commit
6744c57de3
2 changed files with 3 additions and 1 deletions
  1. 1 0
      Documentation/op-guide/configuration.md
  2. 2 1
      embed/config_logging.go

+ 1 - 0
Documentation/op-guide/configuration.md

@@ -339,6 +339,7 @@ The security flags help to [build a secure etcd cluster][security].
 + Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd, or list of comma separated output targets.
 + Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd, or list of comma separated output targets.
 + default: default
 + default: default
 + env variable: ETCD_LOG_OUTPUTS
 + env variable: ETCD_LOG_OUTPUTS
++ 'default' use 'stderr' config for v3.4 during zap logger migraion
 
 
 ### --debug
 ### --debug
 + Drop the default log level to DEBUG for all subpackages.
 + Drop the default log level to DEBUG for all subpackages.

+ 2 - 1
embed/config_logging.go

@@ -152,7 +152,8 @@ func (cfg *Config) setupLogging() error {
 		for _, v := range cfg.LogOutputs {
 		for _, v := range cfg.LogOutputs {
 			switch v {
 			switch v {
 			case DefaultLogOutput:
 			case DefaultLogOutput:
-				return errors.New("'--log-outputs=default' is not supported for v3.4 during zap logger migraion (use 'journal', 'stderr', 'stdout', etc.)")
+				outputPaths[StdErrLogOutput] = struct{}{}
+				errOutputPaths[StdErrLogOutput] = struct{}{}
 
 
 			case JournalLogOutput:
 			case JournalLogOutput:
 				isJournal = true
 				isJournal = true