diff options
| author | Rob Austein <sra@hactrn.net> | 2009-05-11 05:23:41 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-05-11 05:23:41 +0000 |
| commit | 125c61b4f7040e1206fa3eb5b627147bbbd5645b (patch) | |
| tree | ab7657038e44498e226f79614e4abcdae5710057 /rpkid/testbed.py | |
| parent | 42edf90e3796d347cdf907f59b7b0977520632fd (diff) | |
Pass ExitNow exceptions through, as signal handlers can raise them at any time.
svn path=/rpkid/irdbd.py; revision=2423
Diffstat (limited to 'rpkid/testbed.py')
| -rw-r--r-- | rpkid/testbed.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 7ad20534..3be69ec3 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -248,6 +248,8 @@ class main(object): if p is not None: rpki.log.info("Killing %s" % n) os.kill(p.pid, signal.SIGTERM) + except rpki.async.ExitNow: + raise except Exception, data: rpki.log.warn("Couldn't clean up daemons (%s), continuing" % data) |