aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2011-12-12 06:21:47 +0000
committerRob Austein <sra@hactrn.net>2011-12-12 06:21:47 +0000
commitbdd3b43747241ca42c50487502dc0002a047c1d8 (patch)
tree6d6d11d06b48b4f52d789b376e558fc043f2c3b2
parent67a6ef6a1a7e741c5ab2c5b53ad119cb1c5880d3 (diff)
Log more useful error message on unhandled exceptions
svn path=/branches/tk100/; revision=4115
-rw-r--r--rpkid/rpki/http.py2
-rw-r--r--rpkid/rpki/pubd.py2
-rw-r--r--rpkid/rpki/rpkid.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/rpkid/rpki/http.py b/rpkid/rpki/http.py
index d8afd44c..7d7e81ba 100644
--- a/rpkid/rpki/http.py
+++ b/rpkid/rpki/http.py
@@ -534,7 +534,7 @@ class http_server(http_stream):
raise
except Exception, e:
rpki.log.traceback()
- self.send_error(500, "Unhandled exception %s" % e)
+ self.send_error(500, reason = "Unhandled exception %s: %s" % (e.__class__.__name__, e))
else:
self.send_error(code = error[0], reason = error[1])
diff --git a/rpkid/rpki/pubd.py b/rpkid/rpki/pubd.py
index bde1260e..6968780d 100644
--- a/rpkid/rpki/pubd.py
+++ b/rpkid/rpki/pubd.py
@@ -134,7 +134,7 @@ class main(object):
raise
except Exception, e:
rpki.log.traceback()
- cb(500, reason = "Unhandled exception %s" % e)
+ cb(500, reason = "Unhandled exception %s: %s" % (e.__class__.__name__, e))
client_url_regexp = re.compile("/client/([-A-Z0-9_/]+)$", re.I)
diff --git a/rpkid/rpki/rpkid.py b/rpkid/rpki/rpkid.py
index 75624a3c..2c185f18 100644
--- a/rpkid/rpki/rpkid.py
+++ b/rpkid/rpki/rpkid.py
@@ -242,7 +242,7 @@ class main(object):
raise
except Exception, e:
rpki.log.traceback()
- cb(500, reason = "Unhandled exception %s" % e)
+ cb(500, reason = "Unhandled exception %s: %s" % (e.__class__.__name__, e))
up_down_url_regexp = re.compile("/up-down/([-A-Z0-9_]+)/([-A-Z0-9_]+)$", re.I)