valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #35696 from xiaoanyunfei/2016.3

Browse Source 
fix maximum recursion depth bug
This commit is contained in:
Mike Place 2016-08-24 17:01:16 +09:00 committed by GitHub
commit 02d86c6550
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/utils/parsers.py
View File

@ -249,8 +249,9 @@ class OptionParser(optparse.OptionParser, object):
try:
mixin_before_exit_func(self)
except Exception as err: # pylint: disable=broad-except
logging.getLogger(__name__).exception(err)
self.error(
logger = logging.getLogger(__name__)
logger.exception(err)
logger.error(
'Error while processing {0}: {1}'.format(
mixin_before_exit_func, traceback.format_exc(err)
)
@ -872,7 +873,7 @@ class DaemonMixIn(six.with_metaclass(MixInMeta, object)):
)
def _mixin_before_exit(self):
if hasattr(self, 'config'):
if hasattr(self, 'config') and self.config.get('pidfile', ''):
# We've loaded and merged options into the configuration, it's safe
# to query about the pidfile
if self.check_pidfile():