mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
Merge pull request #5747 from slai/develop
Fixed a typo in the default logfile name for the minion.
This commit is contained in:
commit
2b1af0d34f
@ -891,7 +891,7 @@ class MinionOptionParser(MasterOptionParser):
|
|||||||
# ConfigDirMixIn config filename attribute
|
# ConfigDirMixIn config filename attribute
|
||||||
_config_filename_ = 'minion'
|
_config_filename_ = 'minion'
|
||||||
# LogLevelMixIn attributes
|
# LogLevelMixIn attributes
|
||||||
_default_logging_logfile_ = '/var/log/salt/minon'
|
_default_logging_logfile_ = '/var/log/salt/minion'
|
||||||
|
|
||||||
def setup_config(self):
|
def setup_config(self):
|
||||||
return config.minion_config(self.get_config_file_path())
|
return config.minion_config(self.get_config_file_path())
|
||||||
@ -1367,7 +1367,7 @@ class SaltCallOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
|
|||||||
|
|
||||||
# LogLevelMixIn attributes
|
# LogLevelMixIn attributes
|
||||||
_default_logging_level_ = 'info'
|
_default_logging_level_ = 'info'
|
||||||
_default_logging_logfile_ = '/var/log/salt/minon'
|
_default_logging_logfile_ = '/var/log/salt/minion'
|
||||||
|
|
||||||
def _mixin_setup(self):
|
def _mixin_setup(self):
|
||||||
self.add_option(
|
self.add_option(
|
||||||
|
Loading…
Reference in New Issue
Block a user