From f707221b69ed913b7a1cb66c7ab45be2d1586f7c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 15 Jan 2011 19:43:35 -0800 Subject: Tweak PollScheduler signal handling. --- bin/egencache | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/egencache b/bin/egencache index bf729c380..76dd900e7 100755 --- a/bin/egencache +++ b/bin/egencache @@ -272,15 +272,19 @@ class GenCache(object): try: self._regen.run() - - if received_signal: - sys.exit(received_signal[0]) finally: # Restore previous handlers if earlier_sigint_handler is not None: signal.signal(signal.SIGINT, earlier_sigint_handler) + else: + signal.signal(signal.SIGINT, signal.SIG_DFL) if earlier_sigterm_handler is not None: signal.signal(signal.SIGTERM, earlier_sigterm_handler) + else: + signal.signal(signal.SIGTERM, signal.SIG_DFL) + + if received_signal: + sys.exit(received_signal[0]) self.returncode |= self._regen.returncode cp_missing = self._cp_missing -- cgit v1.2.3-1-g7c22