diff options
author | Rob Austein <sra@hactrn.net> | 2014-05-29 19:18:40 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2014-05-29 19:18:40 +0000 |
commit | e6047c9f737275d898d88737719dd09a6ee4f25c (patch) | |
tree | 2741504894c594473b574146b632d0433a5b7186 /rpki/rpkid.py | |
parent | 839c6b3650472ac6c66fe0dadc87ac419a5a70d4 (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/rpkid.py')
-rw-r--r-- | rpki/rpkid.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/rpki/rpkid.py b/rpki/rpkid.py index b619b8e2..3dc14aac 100644 --- a/rpki/rpkid.py +++ b/rpki/rpkid.py @@ -279,7 +279,7 @@ class main(object): except (rpki.async.ExitNow, SystemExit): raise except Exception, e: - rpki.log.traceback(logger) + logger.exception("Unhandled exception serving left-right request") 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) @@ -311,7 +311,7 @@ class main(object): logger.warning(str(e)) cb(400, reason = str(e)) except Exception, e: - rpki.log.traceback(logger) + logger.exception("Unhandled exception processing up-down request") cb(400, reason = "Could not process PDU: %s" % e) def checkpoint(self, force = False): @@ -662,8 +662,7 @@ class ca_obj(rpki.sql.sql_persistent): """ def lose(e): - rpki.log.traceback(logger) - logger.warning("Could not delete CA %r, skipping: %s" % (self, e)) + logger.exception("Could not delete CA %r, skipping", self) callback() def done(): |