From 125c61b4f7040e1206fa3eb5b627147bbbd5645b Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 11 May 2009 05:23:41 +0000 Subject: Pass ExitNow exceptions through, as signal handlers can raise them at any time. svn path=/rpkid/irdbd.py; revision=2423 --- rpkid/rootd.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'rpkid/rootd.py') diff --git a/rpkid/rootd.py b/rpkid/rootd.py index ce5f9f75..1f061cd9 100755 --- a/rpkid/rootd.py +++ b/rpkid/rootd.py @@ -188,6 +188,8 @@ class cms_msg(rpki.up_down.cms_msg): def up_down_handler(query, path, cb): try: q_msg = cms_msg.unwrap(query, (bpki_ta, child_bpki_cert)) + except rpki.async.ExitNow: + raise except Exception, data: rpki.log.error(traceback.format_exc()) return cb(400, "Could not process PDU: %s" % data) @@ -198,10 +200,14 @@ def up_down_handler(query, path, cb): try: q_msg.serve_top_level(None, done) + except rpki.async.ExitNow: + raise except Exception, data: rpki.log.error(traceback.format_exc()) try: done(q_msg.serve_error(data)) + except rpki.async.ExitNow: + raise except Exception, data: rpki.log.error(traceback.format_exc()) cb(500, "Could not process PDU: %s" % data) -- cgit v1.2.3