embed: error when it cannot find journal socket

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

View File

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

View File

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

View File

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