From 3a5c71514c48079725afeda9ee02921bad8ce3c8 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Tue, 10 Jan 2023 18:56:06 +0700 Subject: [PATCH] cmd/ctrld: ensure viper is re-new in --cd mode --- cmd/ctrld/cli.go | 1 + cmd/ctrld/main.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/ctrld/cli.go b/cmd/ctrld/cli.go index af42c25..d9deab8 100644 --- a/cmd/ctrld/cli.go +++ b/cmd/ctrld/cli.go @@ -449,6 +449,7 @@ func processCDFlags() { }, } + v = viper.NewWithOptions(viper.KeyDelimiter("::")) v.Set("network", cfg.Network) v.Set("upstream", cfg.Upstream) v.Set("listener", cfg.Listener) diff --git a/cmd/ctrld/main.go b/cmd/ctrld/main.go index d4362ba..f82ee2f 100644 --- a/cmd/ctrld/main.go +++ b/cmd/ctrld/main.go @@ -60,7 +60,7 @@ func initLogging() { fmt.Fprintf(os.Stderr, "failed to create log path: %v", err) os.Exit(1) } - logFile, err := os.OpenFile(logFilePath, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0600) + logFile, err := os.OpenFile(logFilePath, os.O_APPEND|os.O_CREATE|os.O_RDWR, os.FileMode(0o600)) if err != nil { fmt.Fprintf(os.Stderr, "failed to create log file: %v", err) os.Exit(1)