From fe3ff54c7a87d475d5b2a799c5c85e6300c371db Mon Sep 17 00:00:00 2001 From: yuexiao-wang Date: Tue, 11 Oct 2016 19:35:12 +0800 Subject: [PATCH] Modify function name from SetDaemonLogLevel to SetLogLevel Signed-off-by: yuexiao-wang --- cli/flags/common.go | 5 ++--- cmd/docker/docker.go | 2 +- cmd/dockerd/daemon.go | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cli/flags/common.go b/cli/flags/common.go index 2318b9d975..074d53e315 100644 --- a/cli/flags/common.go +++ b/cli/flags/common.go @@ -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 { diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go index 969cd80876..d412a38b28 100644 --- a/cmd/docker/docker.go +++ b/cmd/docker/docker.go @@ -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) diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index e860c34d8e..3800c840a6 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -395,7 +395,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 }