mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
Merge pull request #49241 from terminalmage/salt-jenkins-1078
Don't silently catch SystemExit
This commit is contained in:
commit
bc0b4ac513
@ -2948,9 +2948,9 @@ class SyndicManager(MinionBase):
|
||||
if auth_wait < self.max_auth_wait:
|
||||
auth_wait += self.auth_wait
|
||||
yield tornado.gen.sleep(auth_wait) # TODO: log?
|
||||
except KeyboardInterrupt:
|
||||
except (KeyboardInterrupt, SystemExit):
|
||||
raise
|
||||
except: # pylint: disable=W0702
|
||||
except Exception:
|
||||
failed = True
|
||||
log.critical(
|
||||
'Unexpected error while connecting to %s',
|
||||
|
Loading…
Reference in New Issue
Block a user