aboutsummaryrefslogtreecommitdiff
path: root/rpkid/pubd.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2009-06-01 05:07:46 +0000
committerRob Austein <sra@hactrn.net>2009-06-01 05:07:46 +0000
commitcd006f969edd7e04f70b12f50b4a0cb844e022ae (patch)
tree04bc33cab361d8a8d4f766fe691409edd3fdae81 /rpkid/pubd.py
parentfd6c0d51c75ccb24b50a4247ac34ab24f62f8636 (diff)
New TLS code mostly working. Only lightly tested so far, but "make
test" ran to completion. svn path=/pow/POW-0.7/POW.c; revision=2481
Diffstat (limited to 'rpkid/pubd.py')
-rwxr-xr-xrpkid/pubd.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpkid/pubd.py b/rpkid/pubd.py
index 84a19ffe..f664f242 100755
--- a/rpkid/pubd.py
+++ b/rpkid/pubd.py
@@ -87,7 +87,7 @@ class pubd_context(object):
try:
self.sql.ping()
self.handler_common(query, None, done, (self.bpki_ta, self.irbe_cert))
- except rpki.async.ExitNow:
+ except (rpki.async.ExitNow, SystemExit):
raise
except Exception, data:
rpki.log.error(traceback.format_exc())
@@ -115,7 +115,7 @@ class pubd_context(object):
if config is None or config.bpki_crl is None:
raise rpki.exceptions.CMSCRLNotSet
self.handler_common(query, client, done, (self.bpki_ta, client.bpki_cert, client.bpki_glue), config.bpki_crl)
- except rpki.async.ExitNow:
+ except (rpki.async.ExitNow, SystemExit):
raise
except Exception, data:
rpki.log.error(traceback.format_exc())