diff options
| author | Rob Austein <sra@hactrn.net> | 2007-12-22 03:31:28 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-12-22 03:31:28 +0000 |
| commit | 4d6552f5d61760b939d4e5f2b90a59d15d04575d (patch) | |
| tree | de2c31b1a45829583c3235a05a103347a035863a /scripts/rpki | |
| parent | 3f20b36ed42efba0ee12317a4b8dbd7c88c24e82 (diff) | |
Checkpoint
svn path=/scripts/irdb.py; revision=1415
Diffstat (limited to 'scripts/rpki')
| -rw-r--r-- | scripts/rpki/https.py | 2 | ||||
| -rw-r--r-- | scripts/rpki/left_right.py | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/scripts/rpki/https.py b/scripts/rpki/https.py index 38c4a116..730e4481 100644 --- a/scripts/rpki/https.py +++ b/scripts/rpki/https.py @@ -75,7 +75,7 @@ class requestHandler(BaseHTTPServer.BaseHTTPRequestHandler): rcode, rtext = handler(query = self.rfile.read(int(self.headers["Content-Length"])), path = self.path) except Exception, edata: - traceback.print_exc() + rpki.log.error(traceback.format_exc()) rcode, rtext = 500, "Unhandled exception %s" % edata self.send_response(rcode) self.send_header("Content-Type", rpki_content_type) diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index 3cfc44be..92fe2835 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -606,8 +606,7 @@ class parent_elt(data_elt): try: rpki.relaxng.up_down.assertValid(q_elt) except lxml.etree.DocumentInvalid: - print "Message does not pass schema check:" - print lxml.etree.tostring(q_elt, pretty_print = True) + rpki.log.error("Message does not pass schema check: " + lxml.etree.tostring(q_elt, pretty_print = True)) raise q_cms = rpki.cms.xml_sign(q_elt, bsc.private_key_id, bsc.signing_cert, encoding = "UTF-8") r_cms = rpki.https.client(x509TrustList = rpki.x509.X509_chain(self.https_ta), @@ -693,7 +692,7 @@ class child_elt(data_elt): try: r_msg = q_msg.serve_top_level(gctx, self) except Exception, data: - traceback.print_exc() + rpki.log.error(traceback.format_exc()) r_msg = q_msg.serve_error(data) # # Exceptions from this point on are problematic, as we have no @@ -704,8 +703,8 @@ class child_elt(data_elt): try: rpki.relaxng.up_down.assertValid(r_elt) except: - print lxml.etree.tostring(r_elt, pretty_print = True, encoding = "UTF-8") - traceback.print_exc() + rpki.log.debug(lxml.etree.tostring(r_elt, pretty_print = True, encoding = "UTF-8")) + rpki.log.error(traceback.format_exc()) raise return rpki.cms.xml_sign(r_elt, bsc.private_key_id, bsc.signing_cert, encoding = "UTF-8") |