diff --git a/cmd/notary-server/config.go b/cmd/notary-server/config.go index 21c0cba772..52856a2813 100644 --- a/cmd/notary-server/config.go +++ b/cmd/notary-server/config.go @@ -301,19 +301,19 @@ func reloadConfig(sig os.Signal, configFile string, oldConfig *viper.Viper, envP switch sig { case syscall.SIGUSR1: if err := utils.AdjustLogLevel(true); err != nil { - fmt.Println("Increase log level failed, will use the old one, error: ", err) + fmt.Printf("Attempt to increase log level failed, will remain at %s level, error: %s", logrus.GetLevel(), err) return } case syscall.SIGUSR2: if err := utils.AdjustLogLevel(false); err != nil { - fmt.Println("Decrease log level failed, will use the old one, error: ", err) + fmt.Printf("Attempt to decrease log level failed, will remain at %s level, error: %s", logrus.GetLevel(), err) return } case syscall.SIGHUP: // We use SIGHUP to allow people to reset the logging level as their wish. lvl, err := utils.ParseLogLevel(config, logrus.ErrorLevel) if err != nil { - fmt.Println("Parse log level failed, will use the old one, error: ", err) + fmt.Printf("Attempt to reset log level failed, will remain at %s level, error: %s", logrus.GetLevel(), err) return } logrus.SetLevel(lvl) diff --git a/cmd/notary-server/main_test.go b/cmd/notary-server/main_test.go index 0089b62b43..06b0427817 100644 --- a/cmd/notary-server/main_test.go +++ b/cmd/notary-server/main_test.go @@ -425,7 +425,6 @@ func TestReloadConfig(t *testing.T) { v := viper.New() utils.SetupViper(v, "envPrefix") - //v.SetConfigType("json") err = utils.ParseViper(v, f.Name()) require.NoError(t, err) diff --git a/docs/reference/server-config.md b/docs/reference/server-config.md index 31a2ca4b28..004ec41b3d 100644 --- a/docs/reference/server-config.md +++ b/docs/reference/server-config.md @@ -363,9 +363,9 @@ Example: ## Hot configuration reload We don't support to hot reload everything at present. What we support for now is: -- increase logging level by signal `SIGUSR1` -- decrease logging level by signal `SIGUSR2` -- hot reload logging level from the config file by signal `SIGHUP` +- increase logging level by signaling `SIGUSR1` +- decrease logging level by signaling `SIGUSR2` +- hot reload logging level from the config file by signaling `SIGHUP` Example: