Merge pull request #27276 from yuexiao-wang/func-name
Modify function name from SetDaemonLogLevel to SetLogLevel
This commit is contained in:
commit
62503f245f
|
@ -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 {
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue