Modify function name from SetDaemonLogLevel to SetLogLevel

yuexiao-wang · yuexiao-wang · commit fe3ff54c7a87 · 2016-10-11T19:35:12.000+08:00
Signed-off-by: yuexiao-wang &lt;wang.yuexiao@zte.com.cn&gt;
diff --git 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
@@ -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
@@ -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
 }

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,8 @@ func (commonOpts CommonOptions) SetDefaultOptions(flags pflag.FlagSet) {`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`-// SetDaemonLogLevel sets the logrus logging level`
`105`		`-// TODO: this is a bad name, it applies to the client as well.`
`106`		`-func SetDaemonLogLevel(logLevel string) {`
	`104`	`+// SetLogLevel sets the logrus logging level`
	`105`	`+func SetLogLevel(logLevel string) {`
`107`	`106`	`if logLevel != "" {`
`108`	`107`	`lvl, err := logrus.ParseLevel(logLevel)`
`109`	`108`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func showVersion() {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`func dockerPreRun(opts *cliflags.ClientOptions) {`
`102`		`- cliflags.SetDaemonLogLevel(opts.Common.LogLevel)`
	`102`	`+ cliflags.SetLogLevel(opts.Common.LogLevel)`
`103`	`103`
`104`	`104`	`if opts.ConfigDir != "" {`
`105`	`105`	`cliconfig.SetConfigDir(opts.ConfigDir)`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ func loadDaemonCliConfig(opts daemonOptions) (*daemon.Config, error) {`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`// ensure that the log level is the one set after merging configurations`
`398`		`- cliflags.SetDaemonLogLevel(config.LogLevel)`
	`398`	`+ cliflags.SetLogLevel(config.LogLevel)`
`399`	`399`
`400`	`400`	`return config, nil`
`401`	`401`	`}`