docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-06 12:54:24 +03:00
Code Activity

Fix error message when failed to reload logging level

Browse Source 
From riyazdf's comments.

Signed-off-by: Hu Keping <hukeping@huawei.com>
This commit is contained in:
HuKeping
2016-06-09 14:44:47 +08:00
parent eb8b53bacb
commit 784eb3737a
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/notary-server/config.go
View File

@@ -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)

1
cmd/notary-server/main_test.go
View File

@@ -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)

6
docs/reference/server-config.md
View File

@@ -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: