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

Patch the run method to log uncaught exceptions

Browse Source
This commit is contained in:
Pedro Algarvio 2016-01-16 19:14:05 +00:00
parent ccc3dffffd
commit eeb6d26d62
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
salt/utils/process.py
View File

@ -556,6 +556,23 @@ class MultiprocessingProcess(multiprocessing.Process, NewStyleClassMixIn):
def __setup_process_logging(self):
salt.log.setup.setup_multiprocessing_logging(self.log_queue)
if not hasattr(self, '_original_run'):
# Patch the run method at runtime because decorating the run method
# with a function with a similar behavior would be ignored once this
# class'es run method is overridden.
self._original_run = self.run
self.run = self._run
def _run(self):
try:
return self._original_run()
except SystemExit:
# These are handled by multiprocessing.Process._bootstrap()
raise
except Exception as exc:
log.error(
'An un-handled exception from the multiprocessing process '
'\'%s\' was caught:\n', self.name, exc_info=True)
class SignalHandlingMultiprocessingProcess(MultiprocessingProcess):