From cd006f969edd7e04f70b12f50b4a0cb844e022ae Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 1 Jun 2009 05:07:46 +0000 Subject: 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 --- rpkid/rootd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rpkid/rootd.py') diff --git a/rpkid/rootd.py b/rpkid/rootd.py index 422ac5ce..aa2e7c2a 100755 --- a/rpkid/rootd.py +++ b/rpkid/rootd.py @@ -202,7 +202,7 @@ 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: + except (rpki.async.ExitNow, SystemExit): raise except Exception, data: rpki.log.error(traceback.format_exc()) @@ -214,13 +214,13 @@ def up_down_handler(query, path, cb): try: q_msg.serve_top_level(None, done) - except rpki.async.ExitNow: + except (rpki.async.ExitNow, SystemExit): raise except Exception, data: rpki.log.error(traceback.format_exc()) try: done(q_msg.serve_error(data)) - except rpki.async.ExitNow: + except (rpki.async.ExitNow, SystemExit): raise except Exception, data: rpki.log.error(traceback.format_exc()) -- cgit v1.2.3