aboutsummaryrefslogtreecommitdiff
path: root/rpki/rootd.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/rootd.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/rootd.py')
-rw-r--r--rpki/rootd.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/rpki/rootd.py b/rpki/rootd.py
index c8398ef7..818f09c7 100644
--- a/rpki/rootd.py
+++ b/rpki/rootd.py
@@ -277,8 +277,8 @@ class main(object):
except (rpki.async.ExitNow, SystemExit):
raise
except Exception, e:
- rpki.log.traceback(logger)
- return cb(400, reason = "Could not process PDU: %s" % e)
+ logger.exception("Problem decoding PDU")
+ return cb(400, reason = "Could not decode PDU: %s" % e)
def done(r_msg):
cb(200, body = cms_msg().wrap(
@@ -290,13 +290,13 @@ class main(object):
except (rpki.async.ExitNow, SystemExit):
raise
except Exception, e:
- rpki.log.traceback(logger)
try:
+ logger.exception("Exception serving up-down request %r", q_msg)
done(q_msg.serve_error(e))
except (rpki.async.ExitNow, SystemExit):
raise
except Exception, e:
- rpki.log.traceback(logger)
+ logger.exception("Exception while generating error report")
cb(500, reason = "Could not process PDU: %s" % e)