diff options
| -rw-r--r-- | rpkid/rpki/gui/app/glue.py | 9 | ||||
| -rw-r--r-- | rpkid/rpki/gui/app/views.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/rpkid/rpki/gui/app/glue.py b/rpkid/rpki/gui/app/glue.py index 9245fa71..7164e829 100644 --- a/rpkid/rpki/gui/app/glue.py +++ b/rpkid/rpki/gui/app/glue.py @@ -188,10 +188,9 @@ def configure_resources(log, handle): call_rpkid = build_rpkid_caller(cfg) call_rpkid(rpki.left_right.self_elt.make_pdu(action='set', self_handle=handle.handle, run_now=True)) -def list_received_resources(conf): - """ - Query rpkid for this resource handle's children and received resources. - """ +def list_received_resources(log, conf): + "Query rpkid for this resource handle's children and received resources." + # if this handle is hosted, get the cfg for the host rpki_conf = conf.host if conf.host else conf cfg = rpki.config.parser(confpath(rpki_conf.handle, 'rpki.conf'), 'myrpki') @@ -224,6 +223,8 @@ def list_received_resources(conf): not_before = datetime.strptime(pdu.notBefore, "%Y-%m-%dT%H:%M:%SZ") not_after = datetime.strptime(pdu.notAfter, "%Y-%m-%dT%H:%M:%SZ") + #print >>log, 'uri: %s, not before: %s, not after: %s' % (pdu.uri, not_before, not_after) + # have we seen this resource cert before? cert_set = parent.resources.filter(uri=pdu.uri) if cert_set.count() == 0: diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py index 2f091c67..06db8b12 100644 --- a/rpkid/rpki/gui/app/views.py +++ b/rpkid/rpki/gui/app/views.py @@ -633,7 +633,7 @@ def ghostbuster_create(request): @handle_required def refresh(request): "Query rpkid, update the db, and redirect back to the dashboard." - glue.list_received_resources(request.session['handle']) + glue.list_received_resources(request.META['wsgi.errors'], request.session['handle']) return http.HttpResponseRedirect(reverse(dashboard)) # vim:sw=4 ts=8 expandtab |