kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

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

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
parent 535f52c932 fe3ff54c7a
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 // SetLogLevel sets the logrus logging level
// TODO: this is a bad name, it applies to the client as well. func SetLogLevel(logLevel string) {
func SetDaemonLogLevel(logLevel string) {
if logLevel != "" { if logLevel != "" {
lvl, err := logrus.ParseLevel(logLevel) lvl, err := logrus.ParseLevel(logLevel)
if err != nil { if err != nil {

2
cmd/docker/docker.go
View File

@ -99,7 +99,7 @@ func showVersion() {
} }
func dockerPreRun(opts *cliflags.ClientOptions) { func dockerPreRun(opts *cliflags.ClientOptions) {
cliflags.SetDaemonLogLevel(opts.Common.LogLevel) cliflags.SetLogLevel(opts.Common.LogLevel)
if opts.ConfigDir != "" { if opts.ConfigDir != "" {
cliconfig.SetConfigDir(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 // ensure that the log level is the one set after merging configurations
cliflags.SetDaemonLogLevel(config.LogLevel) cliflags.SetLogLevel(config.LogLevel)
return config, nil return config, nil
} }