diff options
| author | Rob Austein <sra@hactrn.net> | 2008-10-16 02:58:36 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2008-10-16 02:58:36 +0000 |
| commit | f1be919fbb6f780012ea55e5fd599852571999f3 (patch) | |
| tree | c17cd0cc8847ddb90caf5f46b14b1f9ed3ac0109 /rpkid/rpki | |
| parent | 5955ada37f18ad5dc1a482abf6451db1535d259f (diff) | |
Minor logging cleanups. Don't show backtrace in testpoke unless
debugging. "valid_until" -> "valid_for" in test suite.
svn path=/rpkid/rpki/rpki_engine.py; revision=2021
Diffstat (limited to 'rpkid/rpki')
| -rw-r--r-- | rpkid/rpki/rpki_engine.py | 6 | ||||
| -rw-r--r-- | rpkid/rpki/up_down.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py index bff417d3..416163ae 100644 --- a/rpkid/rpki/rpki_engine.py +++ b/rpkid/rpki/rpki_engine.py @@ -231,7 +231,8 @@ class ca_obj(rpki.sql.sql_persistant): ski = ca_detail.latest_ca_cert.get_SKI() if ski not in cert_map: - rpki.log.warn("Certificate in database missing from list_response, SKI %s, this should never happen" % ca_detail.latest_ca_cert.gSKI()) + rpki.log.warn("Certificate in database missing from list_response, class %s, SKI %s, maybe parent certificate went away?" + % (repr(rc.class_name), ca_detail.latest_ca_cert.gSKI())) ca_detail.delete(self, parent.repository()) continue @@ -251,7 +252,8 @@ class ca_obj(rpki.sql.sql_persistant): del cert_map[ski] if cert_map: - rpki.log.warn("Certificates in list_response missing from our database, SKIs %s" % ", ".join(c.cert.gSKI() for c in cert_map.values())) + rpki.log.warn("Certificates in list_response missing from our database, class %s, SKIs %s" + % (repr(rc.class_name), ", ".join(c.cert.gSKI() for c in cert_map.values()))) @classmethod def create(cls, parent, rc): diff --git a/rpkid/rpki/up_down.py b/rpkid/rpki/up_down.py index a10c4c07..30085390 100644 --- a/rpkid/rpki/up_down.py +++ b/rpkid/rpki/up_down.py @@ -281,7 +281,7 @@ class issue_pdu(base_elt): ca = child.ca_from_class_name(self.class_name) ca_detail = ca.fetch_active() if ca_detail is None: - raise rpki.exceptions.NoActiveCA, "No active CA for class %s" % self.class_name + raise rpki.exceptions.NoActiveCA, "No active CA for class %s" % repr(self.class_name) # Check current cert, if any |