From 7f5e75188ad4527e3c3425a155dfed0847a389dd Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Mon, 19 Oct 2015 03:36:42 +0000
Subject: Amputate old SQL code out of rpkid with a fire axe, replacing it with
 Django ORM.  Duct tape and bailing wire everywhere, much clean-up left to do,
 but basic "make yamltest" suite runs.  Much of the clean-up isn't worth doing
 until after revamping the I/O system, as it'll all change again at that point
 anyway.

svn path=/branches/tk705/; revision=6127
---
 rpki/log.py | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

(limited to 'rpki/log.py')

diff --git a/rpki/log.py b/rpki/log.py
index 7bad6dc2..0ef9ee5b 100644
--- a/rpki/log.py
+++ b/rpki/log.py
@@ -92,9 +92,18 @@ class Formatter(object):
     return "".join(self.coformat(record)).rstrip("\n")
 
   def coformat(self, record):
-    if not self.is_syslog:
-      yield time.strftime("%Y-%m-%d %H:%M:%S ", time.gmtime(record.created))
-    yield "%s[%d]: " % (self.ident, record.process)
+
+    try:
+      if not self.is_syslog:
+        yield time.strftime("%Y-%m-%d %H:%M:%S ", time.gmtime(record.created))
+    except:                             # pylint: disable=W0702
+      yield "[$!$Time format failed]"
+
+    try:
+      yield "%s[%d]: " % (self.ident, record.process)
+    except:                             # pylint: disable=W0702
+      yield "[$!$ident format failed]"
+
     try:
       if isinstance(record.context, (str, unicode)):
         yield record.context + " "
@@ -102,16 +111,26 @@ class Formatter(object):
         yield repr(record.context) + " "
     except AttributeError:
       pass
-    yield record.getMessage()
-    if record.exc_info:
-      if self.is_syslog or not enable_tracebacks:
-        lines = tb.format_exception_only(record.exc_info[0], record.exc_info[1])
-        lines.insert(0, ": ")
-      else:
-        lines = tb.format_exception(record.exc_info[0], record.exc_info[1], record.exc_info[2])
-        lines.insert(0, "\n")
-      for line in lines:
-        yield line
+    except:                             # pylint: disable=W0702
+      yield "[$!$context format failed]"
+
+    try:
+      yield record.getMessage()
+    except:                             # pylint: disable=W0702
+      yield "[$!$record.getMessage() failed]"
+
+    try:
+      if record.exc_info:
+        if self.is_syslog or not enable_tracebacks:
+          lines = tb.format_exception_only(record.exc_info[0], record.exc_info[1])
+          lines.insert(0, ": ")
+        else:
+          lines = tb.format_exception(record.exc_info[0], record.exc_info[1], record.exc_info[2])
+          lines.insert(0, "\n")
+        for line in lines:
+          yield line
+    except:                             # pylint: disable=W0702
+      yield "[$!$exception formatting failed]"
 
 
 def argparse_setup(parser, default_thunk = None):
-- 
cgit v1.2.3