aboutsummaryrefslogtreecommitdiff
path: root/scripts/rpkid.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2007-09-18 21:44:21 +0000
committerRob Austein <sra@hactrn.net>2007-09-18 21:44:21 +0000
commit2c5df0fe0ecf1683bf2935d027411905035042b0 (patch)
tree259f542f3669c0855fe2b9a12e606f7df7bc0888 /scripts/rpkid.py
parentf0d2933a30b05039919a3aecbb53e640d4c9c126 (diff)
Start adding our own exceptions.
svn path=/scripts/rpki/cms.py; revision=988
Diffstat (limited to 'scripts/rpkid.py')
-rwxr-xr-xscripts/rpkid.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/rpkid.py b/scripts/rpkid.py
index 94d98fed..4abc93ae 100755
--- a/scripts/rpkid.py
+++ b/scripts/rpkid.py
@@ -6,9 +6,7 @@ framework onto which I'm bolting various parts for testing.
"""
import tlslite.api, MySQLdb, xml.sax, lxml.etree, lxml.sax, POW, POW.pkix, traceback
-import rpki.https, rpki.config, rpki.resource_set, rpki.up_down, rpki.left_right, rpki.relaxng, rpki.cms
-
-show_traceback = True
+import rpki.https, rpki.config, rpki.resource_set, rpki.up_down, rpki.left_right, rpki.relaxng, rpki.cms, rpki.exceptions
def decode(msg, cms_ta):
return lxml.etree.fromstring(rpki.cms.decode(msg, cms_ta))
@@ -34,9 +32,7 @@ def left_right_handler(query, path):
raise
return 200, encode(r_elt, cms_key, cms_certs)
except Exception, data:
- if show_traceback:
- traceback.print_exc()
- raise
+ traceback.print_exc()
return 500, "Unhandled exception %s" % data
def up_down_handler(query, path):