upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-08 08:12:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Call _call_signals after _reset_signals.

Browse source
This commit is contained in:
Blake Griffith 2016-07-06 15:59:51 -05:00
parent 40983d67d7
commit 2e7f02805c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
certbot/error_handler.py
View file

@ -75,10 +75,10 @@ class ErrorHandler(object):
traceback.format_exception(exec_type, exec_value, trace)))
self._call_registered()
self._call_signals()
return retval
finally:
self._reset_signal_handlers()
prev_handlers = self._reset_signal_handlers()
self._call_signals(prev_handlers)
def register(self, func, *args, **kwargs):
"""Sets func to be called with *args and **kwargs during cleanup
@ -112,7 +112,9 @@ class ErrorHandler(object):
"""Resets signal handlers for signals in _SIGNALS."""
for signum in self.prev_handlers:
signal.signal(signum, self.prev_handlers[signum])
out = dict((k, v) for k, v in self.prev_handlers.items())
self.prev_handlers.clear()
return out
def _signal_handler(self, signum, unused_frame):
"""Replacement function for handling recieved signals.
@ -127,7 +129,7 @@ class ErrorHandler(object):
if not self.body_executed:
raise errors.SignalExit
def _call_signals(self):
def _call_signals(self, prev_handlers):
"""Finally call the deferred signals.
:param int signum: signal number
@ -135,5 +137,5 @@ class ErrorHandler(object):
"""
for signum in self.received_signals:
logger.debug("Calling signal %s", signum)
signal.signal(signum, self.prev_handlers[signum])
signal.signal(signum, prev_handlers[signum])
os.kill(os.getpid(), signum)