Merge pull request #5747 from slai/develop

Fixed a typo in the default logfile name for the minion.
This commit is contained in:
Joseph Hall 2013-06-26 08:11:15 -07:00
commit 2b1af0d34f

View File

@ -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(