From c4451a1e94212025e060cfd8e6a2341527202086 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 15 Jan 2011 16:00:35 -0800 Subject: Add PollScheduler.terminate() for interruption. This allows PollScheduler instances to do basic cleanup and terminate gracefully when SIGINT or SIGTERM signals are received. --- bin/egencache | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/egencache b/bin/egencache index 2fb30a07c..bf729c380 100755 --- a/bin/egencache +++ b/bin/egencache @@ -258,7 +258,30 @@ class GenCache(object): level=logging.ERROR, noiselevel=-1) def run(self): - self._regen.run() + + received_signal = [] + + def sighandler(signum, frame): + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + self._regen.terminate() + received_signal.append(128 + signum) + + earlier_sigint_handler = signal.signal(signal.SIGINT, sighandler) + earlier_sigterm_handler = signal.signal(signal.SIGTERM, sighandler) + + 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) + if earlier_sigterm_handler is not None: + signal.signal(signal.SIGTERM, earlier_sigterm_handler) + self.returncode |= self._regen.returncode cp_missing = self._cp_missing -- cgit v1.2.3-1-g7c22