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: error when it cannot find journal socket

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-05-16 14:25:10 -07:00
parent 1e953bd187
commit 5a61dc8008
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embed/config_logging.go
View File

@ -225,7 +225,11 @@ func (cfg *Config) setupLogging() error {
}
// use stderr as fallback
syncer := getZapWriteSyncer()
syncer, lerr := getJournalWriteSyncer()
if lerr != nil {
return lerr
}
lvl := zap.NewAtomicLevelAt(zap.InfoLevel)
if cfg.Debug {
lvl = zap.NewAtomicLevelAt(zap.DebugLevel)

9
embed/config_logging_journald_unix.go
View File

@ -17,6 +17,7 @@
package embed
import (
"fmt"
"os"
"github.com/coreos/etcd/pkg/logutil"
@ -25,6 +26,10 @@ import (
)
// use stderr as fallback
func getZapWriteSyncer() zapcore.WriteSyncer {
return zapcore.AddSync(logutil.NewJournaldWriter(os.Stderr))
func getJournalWriteSyncer() (zapcore.WriteSyncer, error) {
jw, err := logutil.NewJournaldWriter(os.Stderr)
if err != nil {
return nil, fmt.Errorf("can't find journald (%v)", err)
}
return zapcore.AddSync(jw), nil
}

4
embed/config_logging_journald_windows.go
View File

@ -22,6 +22,6 @@ import (
"go.uber.org/zap/zapcore"
)
func getZapWriteSyncer() zapcore.WriteSyncer {
return zapcore.AddSync(os.Stderr)
func getJournalWriteSyncer() (zapcore.WriteSyncer, error) {
return zapcore.AddSync(os.Stderr), nil
}