Skip to content

Commit 706adde

Browse files
committed
fix production logging with backrestmon
1 parent 9f5a604 commit 706adde

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

cmd/backrest/backrest.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ func main() {
131131
}
132132

133133
func init() {
134-
zap.ReplaceGlobals(zap.Must(zap.NewProduction()))
135134
if !strings.HasPrefix(os.Getenv("ENV"), "prod") {
136135
c := zap.NewDevelopmentEncoderConfig()
137136
c.EncodeLevel = zapcore.CapitalColorLevelEncoder
@@ -142,6 +141,12 @@ func init() {
142141
zapcore.DebugLevel,
143142
))
144143
zap.ReplaceGlobals(l)
144+
} else {
145+
zap.ReplaceGlobals(zap.New(zapcore.NewCore(
146+
zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig()),
147+
zapcore.AddSync(os.Stdout),
148+
zapcore.DebugLevel,
149+
)))
145150
}
146151
}
147152

cmd/backrestmon/backrestmon.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ func main() {
4242

4343
cmd := exec.CommandContext(ctx, backrest)
4444
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
45-
cmd.Env = append(os.Environ(), "ENV=prod")
45+
cmd.Env = os.Environ()
46+
cmd.Env = append(cmd.Env, "ENV=production")
4647

4748
pro, pwo := io.Pipe()
4849
pre, pwe := io.Pipe()

0 commit comments

Comments
 (0)