From e6047c9f737275d898d88737719dd09a6ee4f25c Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 29 May 2014 19:18:40 +0000 Subject: 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 --- rpki/old_irdbd.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'rpki/old_irdbd.py') diff --git a/rpki/old_irdbd.py b/rpki/old_irdbd.py index 953d951d..8772e5b6 100644 --- a/rpki/old_irdbd.py +++ b/rpki/old_irdbd.py @@ -256,14 +256,14 @@ class main(object): raise except Exception, e: - rpki.log.traceback(logger) + logger.exception("Exception serving PDU %r", q_pdu) r_msg.append(rpki.left_right.report_error_elt.from_exception(e, q_pdu.self_handle, q_pdu.tag)) except (rpki.async.ExitNow, SystemExit): raise except Exception, e: - rpki.log.traceback(logger) + logger.exception("Exception decoding query") r_msg.append(rpki.left_right.report_error_elt.from_exception(e)) cb(200, body = rpki.left_right.cms_msg().wrap(r_msg, self.irdbd_key, self.irdbd_cert)) @@ -272,11 +272,7 @@ class main(object): raise except Exception, e: - rpki.log.traceback(logger) - - # We only get here in cases where we couldn't or wouldn't generate - # , so just return HTTP failure. - + logger.exception("Unhandled exception, returning HTTP failure") cb(500, reason = "Unhandled exception %s: %s" % (e.__class__.__name__, e)) -- cgit v1.2.3