saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix getting Salt API default logfile option

Browse source
This commit is contained in:
Denys Havrysh 2016-11-06 16:45:17 +02:00
parent f2422373c1
commit c25f2d091e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/utils/parsers.py
View file

@ -167,8 +167,8 @@ class OptionParser(optparse.OptionParser, object):
new_inargs = sys.stdin.readlines()
new_inargs = [arg.rstrip('\r\n') for arg in new_inargs]
new_options, new_args = optparse.OptionParser.parse_args(
self,
new_inargs)
self,
new_inargs)
options.__dict__.update(new_options.__dict__)
args.extend(new_args)
@ -2925,7 +2925,7 @@ class SaltAPIParser(six.with_metaclass(OptionParserMeta,
# ConfigDirMixIn config filename attribute
_config_filename_ = 'master'
# LogLevelMixIn attributes
_default_logging_logfile_ = config.DEFAULT_API_OPTS['logfile']
_default_logging_logfile_ = config.DEFAULT_API_OPTS['api_logfile']
def setup_config(self):
return salt.config.api_config(self.get_config_file_path()) # pylint: disable=no-member