JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ignored config logger settings (#938)

Browse Source
This commit is contained in:
Michal Niewrzal 2018-12-27 10:38:11 +01:00 committed by GitHub
parent 312fd5a5fd
commit a9572b7169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/process/exec_conf.go
View File

@ -122,8 +122,6 @@ func cleanup(cmd *cobra.Command) {
vip.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_"))
vip.AutomaticEnv()
logger, err := newLogger()
cfgFlag := cmd.Flags().Lookup("config-dir")
if cfgFlag != nil && cfgFlag.Value.String() != "" {
path := filepath.Join(os.ExpandEnv(cfgFlag.Value.String()), "config.yaml")
@ -134,7 +132,6 @@ func cleanup(cmd *cobra.Command) {
return err
}
logger.Sugar().Debug("Configuration loaded from: ", vip.ConfigFileUsed())
}
}
@ -154,9 +151,13 @@ func cleanup(cmd *cobra.Command) {
}
}
logger, err := newLogger()
if err != nil {
return err
}
logger.Sugar().Debug("Configuration loaded from: ", vip.ConfigFileUsed())
defer func() { _ = logger.Sync() }()
defer zap.ReplaceGlobals(logger)()
defer zap.RedirectStdLog(logger)()