beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #27276 from yuexiao-wang/func-name

Browse source 
Modify function name from SetDaemonLogLevel to SetLogLevel
This commit is contained in:
Tõnis Tiigi 2016-10-13 12:10:59 -07:00 committed by GitHub
commit 62503f245f
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cli/flags/common.go
View file

@ -101,9 +101,8 @@ func (commonOpts *CommonOptions) SetDefaultOptions(flags *pflag.FlagSet) {
}
}
// SetDaemonLogLevel sets the logrus logging level
// TODO: this is a bad name, it applies to the client as well.
func SetDaemonLogLevel(logLevel string) {
// SetLogLevel sets the logrus logging level
func SetLogLevel(logLevel string) {
if logLevel != "" {
lvl, err := logrus.ParseLevel(logLevel)
if err != nil {

2
cmd/docker/docker.go
View file

@ -99,7 +99,7 @@ func showVersion() {
}
func dockerPreRun(opts *cliflags.ClientOptions) {
cliflags.SetDaemonLogLevel(opts.Common.LogLevel)
cliflags.SetLogLevel(opts.Common.LogLevel)
if opts.ConfigDir != "" {
cliconfig.SetConfigDir(opts.ConfigDir)

2
cmd/dockerd/daemon.go
View file

@ -397,7 +397,7 @@ func loadDaemonCliConfig(opts daemonOptions) (*daemon.Config, error) {
}
// ensure that the log level is the one set after merging configurations
cliflags.SetDaemonLogLevel(config.LogLevel)
cliflags.SetLogLevel(config.LogLevel)
return config, nil
}