diff options
| author | Rob Austein <sra@hactrn.net> | 2013-04-16 20:24:08 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-04-16 20:24:08 +0000 |
| commit | f284e73a913b71bc6fccd609c145e3d9d14dce2f (patch) | |
| tree | 60b9760a01bcdca850d1fe381f719249237e4754 /rpkid/rpki/rpkid_tasks.py | |
| parent | 4e9ce1785929656eeef7eb8af270213c8869a1c6 (diff) | |
Restrict use of rpkid.self.regen_margin to certificate regeneration,
sharing a single regeneration interval value between certificates and
CRLs just doesn't work, and we can infer the CRL regeneration interval
from crl_interval. Change default value of regen_margin to something
consistent with human-time-scale expectations and the GUI's impending
expiration warning interval. See #347 and #512.
svn path=/trunk/; revision=5297
Diffstat (limited to 'rpkid/rpki/rpkid_tasks.py')
| -rw-r--r-- | rpkid/rpki/rpkid_tasks.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rpkid/rpki/rpkid_tasks.py b/rpkid/rpki/rpkid_tasks.py index c77de3ac..5b1874b2 100644 --- a/rpkid/rpki/rpkid_tasks.py +++ b/rpkid/rpki/rpkid_tasks.py @@ -544,7 +544,8 @@ class RegenerateCRLsAndManifestsTask(AbstractTask): rpki.log.debug("Self %s[%d] regenerating CRLs and manifests" % (self.self_handle, self.self_id)) now = rpki.sundial.now() - regen_margin = rpki.sundial.timedelta(seconds = self.regen_margin) + crl_interval = rpki.sundial.timedelta(seconds = self.crl_interval) + regen_margin = max(self.gctx.cron_period * 2, crl_interval / 4) publisher = rpki.rpkid.publication_queue() for parent in self.parents: |