diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-01-15 16:00:35 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-01-16 12:33:32 -0800 |
commit | 9cb900a38fed06178d8c6281c2e9466187666732 (patch) | |
tree | a653f727ba08ba16e74be5837bb2605505fe7251 /bin | |
parent | c8169e703374ab9efa4facd0a06994a85b6f87c2 (diff) | |
download | portage-9cb900a38fed06178d8c6281c2e9466187666732.tar.gz portage-9cb900a38fed06178d8c6281c2e9466187666732.tar.bz2 portage-9cb900a38fed06178d8c6281c2e9466187666732.zip |
Add PollScheduler.terminate() for interruption.
This allows PollScheduler instances to do basic cleanup and terminate
gracefully when SIGINT or SIGTERM signals are received.
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/egencache | 25 |
1 files changed, 24 insertions, 1 deletions
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 |