valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't let sys exits bubble into the reactor.

Browse Source 
Though async should prevent this, here is an additional layer of safety
to prevent an uncaught exit from killing a master
This commit is contained in:
Mike Place 2015-01-08 17:41:43 -07:00
parent 783de9584a
commit a0cf68acc0
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
salt/utils/reactor.py
View File

@ -135,7 +135,10 @@ class Reactor(multiprocessing.Process, salt.state.Compiler):
continue
chunks = self.reactions(data['tag'], data['data'], reactors)
if chunks:
self.call_reactions(chunks)
try:
self.call_reactions(chunks)
except SystemExit:
log.warning('Exit ignored by reactor')
class ReactWrap(object):
@ -176,7 +179,10 @@ class ReactWrap(object):
'''
if 'local' not in self.client_cache:
self.client_cache['local'] = salt.client.LocalClient(self.opts['conf_file'])
self.client_cache['local'].cmd_async(*args, **kwargs)
try:
self.client_cache['local'].cmd_async(*args, **kwargs)
except SystemExit:
log.warning('Attempt to exit reactor. Ignored.')
cmd = local
@ -186,7 +192,10 @@ class ReactWrap(object):
'''
if 'runner' not in self.client_cache:
self.client_cache['runner'] = salt.runner.RunnerClient(self.opts)
self.pool.fire_async(self.client_cache['runner'].low, args=(fun, kwargs))
try:
self.pool.fire_async(self.client_cache['runner'].low, args=(fun, kwargs))
except SystemExit:
log.warning('Attempt to exit in reactor by runner. Ignored')
def wheel(self, fun, **kwargs):
'''
@ -194,4 +203,7 @@ class ReactWrap(object):
'''
if 'wheel' not in self.client_cache:
self.client_cache['wheel'] = salt.wheel.Wheel(self.opts)
self.pool.fire_async(self.client_cache['wheel'].low, args=(fun, kwargs))
try:
self.pool.fire_async(self.client_cache['wheel'].low, args=(fun, kwargs))
except SystemExit:
log.warning('Attempt to in reactor by whell. Ignored.')