aboutsummaryrefslogtreecommitdiff
path: root/rpkid/rpki/rpkid.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2012-08-17 02:25:44 +0000
committerRob Austein <sra@hactrn.net>2012-08-17 02:25:44 +0000
commit025ecf5e1000533c995fbe58ca7b957b78b3fa0a (patch)
tree066882edbab17ecc8999d96e9f0364cf302578d3 /rpkid/rpki/rpkid.py
parentb4b2a2b3cba9d523b8b543dc0e2cd6a3d6887c61 (diff)
Automate SQL pings. Suppress case where ROA regeneration gratuitously
updated CRL and manifest. More debug logging. svn path=/branches/tk274/; revision=4632
Diffstat (limited to 'rpkid/rpki/rpkid.py')
-rw-r--r--rpkid/rpki/rpkid.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/rpkid/rpki/rpkid.py b/rpkid/rpki/rpkid.py
index ca27dbdc..f2a10abb 100644
--- a/rpkid/rpki/rpkid.py
+++ b/rpkid/rpki/rpkid.py
@@ -1181,13 +1181,16 @@ class ca_detail_obj(rpki.sql.sql_persistent):
nextUpdate = now + crl_interval
if self.latest_manifest_cert is None or self.latest_manifest_cert.getNotAfter() < nextUpdate:
+ rpki.log.debug("Generating manifest certificate")
self.generate_manifest_cert()
+ rpki.log.debug("Constructing manifest object list")
objs = [(self.crl_uri_tail, self.latest_crl)]
objs.extend((c.uri_tail, c.cert) for c in self.child_certs)
objs.extend((r.uri_tail, r.roa) for r in self.roas if r.roa is not None)
objs.extend((g.uri_tail, g.ghostbuster) for g in self.ghostbusters)
+ rpki.log.debug("Building manifest object")
self.latest_manifest = rpki.x509.SignedManifest.build(
serial = ca.next_manifest_number(),
thisUpdate = now,
@@ -1196,6 +1199,7 @@ class ca_detail_obj(rpki.sql.sql_persistent):
keypair = self.manifest_private_key_id,
certs = self.latest_manifest_cert)
+ rpki.log.debug("Manifest generation took %s" % (rpki.sundial.now() - now))
self.manifest_published = rpki.sundial.now()
self.sql_mark_dirty()