aboutsummaryrefslogtreecommitdiff
path: root/rpki/pubd.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-05-29 19:18:40 +0000
committerRob Austein <sra@hactrn.net>2014-05-29 19:18:40 +0000
commite6047c9f737275d898d88737719dd09a6ee4f25c (patch)
tree2741504894c594473b574146b632d0433a5b7186 /rpki/pubd.py
parent839c6b3650472ac6c66fe0dadc87ac419a5a70d4 (diff)
Provide our own logging Formatter class rather than straining to
subclass the stock one. Replace all uses of rpki.log.traceback() with logging package .exception() calls. Use LoggingAdapter for all the whacky per-stream logging code in rpki.http. Fix default logging priority for non-daemon programs like rpkic. svn path=/trunk/; revision=5843
Diffstat (limited to 'rpki/pubd.py')
-rw-r--r--rpki/pubd.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpki/pubd.py b/rpki/pubd.py
index 5a345c4d..e3498a27 100644
--- a/rpki/pubd.py
+++ b/rpki/pubd.py
@@ -142,7 +142,7 @@ class main(object):
except (rpki.async.ExitNow, SystemExit):
raise
except Exception, e:
- rpki.log.traceback(logger)
+ logger.exception("Unhandled exception processing control query, path %r", path)
cb(500, reason = "Unhandled exception %s: %s" % (e.__class__.__name__, e))
client_url_regexp = re.compile("/client/([-A-Z0-9_/]+)$", re.I)
@@ -170,5 +170,5 @@ class main(object):
except (rpki.async.ExitNow, SystemExit):
raise
except Exception, e:
- rpki.log.traceback(logger)
+ logger.exception("Unhandled exception processing client query, path %r", path)
cb(500, reason = "Could not process PDU: %s" % e)