From 370b80a69e48dd36bdfd0922dcf65318d6db68f4 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 25 Sep 2014 04:13:23 +0000 Subject: Convert remaining rpkid up-down code from SAX to etree. svn path=/branches/tk705/; revision=5970 --- rpki/rootd.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'rpki/rootd.py') diff --git a/rpki/rootd.py b/rpki/rootd.py index 2bd7ce44..987d8356 100644 --- a/rpki/rootd.py +++ b/rpki/rootd.py @@ -355,9 +355,8 @@ class main(object): self.rpkid_cms_timestamp = q_cms.check_replay(self.rpkid_cms_timestamp, request.path) getattr(self, "handle_" + q_type)(q_msg, r_msg) except Exception, e: - # Should catch specific exceptions here to give better error codes. logger.exception("Exception processing up-down %s message", q_type) - rpki.up_down.generate_error_response(r_msg, description = e) + rpki.up_down.generate_error_response_from_exception(r_msg, e, q_type) request.send_cms_response(rpki.up_down.cms_msg_no_sax().wrap(r_msg, self.rootd_bpki_key, self.rootd_bpki_cert, self.rootd_bpki_crl if self.include_bpki_crl else None)) except Exception, e: -- cgit v1.2.3