Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

embed: improve "--log-outputs" error message, add godoc

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-26 11:35:11 -07:00
parent b0e4fc3974
commit 6d0f71e4c2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
embed/config.go
View File

@ -469,7 +469,7 @@ func (cfg *Config) setupLogging() error {
} }
if len(cfg.LogOutputs) != 1 { if len(cfg.LogOutputs) != 1 {
fmt.Printf("expected only 1 value in 'log-output', got %v\n", cfg.LogOutputs) fmt.Printf("--logger=capnslog supports only 1 value in '--log-outputs', got %q\n", cfg.LogOutputs)
os.Exit(1) os.Exit(1)
} }
// capnslog initially SetFormatter(NewDefaultFormatter(os.Stderr)) // capnslog initially SetFormatter(NewDefaultFormatter(os.Stderr))
@ -596,6 +596,9 @@ func (cfg *Config) setupLogging() error {
lvl = zap.NewAtomicLevelAt(zap.DebugLevel) lvl = zap.NewAtomicLevelAt(zap.DebugLevel)
grpc.EnableTracing = true grpc.EnableTracing = true
} }
// WARN: do not change field names in encoder config
// journald logging writer assumes field names of "level" and "caller"
cr := zapcore.NewCore( cr := zapcore.NewCore(
zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig()), zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig()),
syncer, syncer,