Clean up and consolidate traceback. Add methods to hide (some of the)

mucking about with msg.type variables.  Include query PDU tags in
reply <report_error/> PDUs.

svn path=/rpkid/irbe-setup.py; revision=2571

1 files changed, 3 insertions, 3 deletions

diff --git a/rpkid/pubd.py b/rpkid/pubd.py
index 33261737..4af6b55a 100755
--- a/rpkid/pubd.py
+++ b/rpkid/pubd.py
@@ -38,7 +38,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 """
 
-import traceback, os, time, getopt, sys, re
+import os, time, getopt, sys, re
 import rpki.resource_set, rpki.up_down, rpki.left_right, rpki.x509, rpki.sql
 import rpki.https, rpki.config, rpki.exceptions, rpki.relaxng, rpki.log
 import rpki.publication
@@ -90,7 +90,7 @@ class pubd_context(object):
     except (rpki.async.ExitNow, SystemExit):
       raise
     except Exception, data:
-      rpki.log.error(traceback.format_exc())
+      rpki.log.traceback()
       cb(500, "Unhandled exception %s" % data)
 
   client_url_regexp = re.compile("/client/([-A-Z0-9_]+)$", re.I)
@@ -120,7 +120,7 @@ class pubd_context(object):
     except (rpki.async.ExitNow, SystemExit):
       raise
     except Exception, data:
-      rpki.log.error(traceback.format_exc())
+      rpki.log.traceback()
       cb(500, "Could not process PDU: %s" % data)
 
   ## @var https_ta_cache