Merge pull request #49241 from terminalmage/salt-jenkins-1078

Don't silently catch SystemExit
This commit is contained in:
Daniel Wallace 2018-08-22 07:57:57 -05:00 committed by GitHub
commit bc0b4ac513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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',