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

Merge pull request #35339 from isbm/isbm-2015.8-minion-importerror-fix

Browse source 
Bugfix: Prevent continuous restart, if a dependency wasn't installed
This commit is contained in:
Thomas S Hatch 2016-08-11 10:15:16 -06:00 • committed by GitHub
commit 9ea7a34c30
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/scripts.py
View file

@ -81,6 +81,8 @@ def minion_process(queue):
try:
minion = salt.cli.daemons.Minion()
minion.start()
except ImportError as exc:
log.error(exc)
except (Exception, SaltClientError, SaltReqTimeoutError, SaltSystemExit) as exc:
log.error(
'Minion failed to start: {0}'.format(get_error_message(exc)),
@ -88,7 +90,7 @@ def minion_process(queue):
)
restart = True
except SystemExit as exc:
restart = False
log.error(exc)
if restart is True:
log.warning('Fatal functionality error caught by minion handler:\n', exc_info=True)