diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/irdb.py | 4 | ||||
| -rw-r--r-- | scripts/rpki/https.py | 2 | ||||
| -rw-r--r-- | scripts/rpki/left_right.py | 9 | ||||
| -rwxr-xr-x | scripts/rpkid.py | 9 | ||||
| -rwxr-xr-x | scripts/testroot.py | 10 |
5 files changed, 15 insertions, 19 deletions
diff --git a/scripts/irdb.py b/scripts/irdb.py index ec8bb13b..2ba02b40 100755 --- a/scripts/irdb.py +++ b/scripts/irdb.py @@ -51,7 +51,7 @@ def handler(query, path): r_pdu.ipv6 = rpki.resource_set.resource_set_ipv6.from_sql(cur, "SELECT start_ip, end_ip FROM net WHERE registrant_id = %s AND version = 6" % registrant_id) except Exception, data: - traceback.print_exc() + rpki.log.error(traceback.format_exc()) r_pdu = rpki.left_right.report_error_elt.from_exception(data, q_pdu.self_id) r_msg.append(r_pdu) @@ -61,7 +61,7 @@ def handler(query, path): return 200, rpki.cms.xml_sign(r_elt, cms_key, cms_certs) except Exception, data: - traceback.print_exc() + rpki.log.error(traceback.format_exc()) # We only get here in cases where we couldn't or wouldn't generate # <report_error/>, so just return HTTP failure. 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") diff --git a/scripts/rpkid.py b/scripts/rpkid.py index ef8ff2be..bd41ca67 100755 --- a/scripts/rpkid.py +++ b/scripts/rpkid.py @@ -25,12 +25,11 @@ def left_right_handler(query, path): reply = rpki.cms.xml_sign(r_elt, gctx.cms_key, gctx.cms_certs) return 200, reply except lxml.etree.DocumentInvalid: - print "Received reply document does not pass schema check:" - print lxml.etree.tostring(r_elt, pretty_print = True) - traceback.print_exc() + rpki.log.warning("Received reply document does not pass schema check: " + lxml.etree.tostring(r_elt, pretty_print = True)) + rpki.log.warning(traceback.format_exc()) return 500, "Schema violation" except Exception, data: - traceback.print_exc() + rpki.log.error(traceback.format_exc()) return 500, "Unhandled exception %s" % data def up_down_handler(query, path): @@ -46,7 +45,7 @@ def up_down_handler(query, path): reply = child.serve_up_down(gctx, query) return 200, reply except Exception, data: - traceback.print_exc() + rpki.log.error(traceback.format_exc()) return 400, "Could not process PDU: %s" % data def cronjob_handler(query, path): diff --git a/scripts/testroot.py b/scripts/testroot.py index 44817218..831ee3d5 100755 --- a/scripts/testroot.py +++ b/scripts/testroot.py @@ -113,7 +113,7 @@ def up_down_handler(query, path): rpki.relaxng.up_down.assertValid(q_elt) q_msg = sax_handler.saxify(q_elt) except Exception, data: - traceback.print_exc() + rpki.log.error(traceback.format_exc()) return 400, "Could not process PDU: %s" % data try: r_msg = q_msg.serve_top_level(None, None) @@ -121,20 +121,18 @@ def up_down_handler(query, path): try: rpki.relaxng.up_down.assertValid(r_elt) except lxml.etree.DocumentInvalid: - print - print lxml.etree.tostring(r_elt, pretty_print = True, encoding ="utf-8", xml_declaration = True) - print + rpki.log.debug(lxml.etree.tostring(r_elt, pretty_print = True, encoding ="utf-8", xml_declaration = True)) raise return 200, rpki.cms.xml_sign(r_elt, cms_key, cms_certs, encoding = "utf-8") except Exception, data: - traceback.print_exc() + rpki.log.error(traceback.format_exc()) try: r_msg = q_msg.serve_error(data) r_elt = r_msg.toXML() rpki.relaxng.up_down.assertValid(r_elt) return 200, rpki.cms.xml_sign(r_elt, cms_key, cms_certs, encoding = "utf-8") except Exception, data: - traceback.print_exc() + rpki.log.error(traceback.format_exc()) return 500, "Could not process PDU: %s" % data os.environ["TZ"] = "UTC" |