diff options
| author | Rob Austein <sra@hactrn.net> | 2015-10-22 20:48:27 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-10-22 20:48:27 +0000 |
| commit | d97d997b135005d7c71d07e3befaef71789b8b06 (patch) | |
| tree | 171f86403fc6dc1325e43581714acfe21074d75c /rpki | |
| parent | 588d6a4300432e952d731e4a3add059820a244b6 (diff) | |
Fix a couple of places where we were calling coroutines as if they
were ordinary functions. May want some kind of naming scheme or other
convention to make it easier to avoid this sort of thing.
svn path=/branches/tk705/; revision=6142
Diffstat (limited to 'rpki')
| -rw-r--r-- | rpki/rpkid_tasks.py | 3 | ||||
| -rw-r--r-- | rpki/rpkidb/models.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/rpki/rpkid_tasks.py b/rpki/rpkid_tasks.py index 0a9c1654..edca9ace 100644 --- a/rpki/rpkid_tasks.py +++ b/rpki/rpkid_tasks.py @@ -155,7 +155,7 @@ class PollParentTask(AbstractTask): ca = ca_map.pop(class_name, None) if ca is None: logger.debug("%r: Creating new CA for resource class %r", self, class_name) - rpki.rpkidb.models.CA.create(rpkid = self.rpkid, parent = parent, rc = rc) + yield rpki.rpkidb.models.CA.create(rpkid = self.rpkid, parent = parent, rc = rc) else: logger.debug("%r: Checking updates for existing CA %r for resource class %r", self, ca, class_name) yield ca.check_for_updates(rpkid = self.rpkid, parent = parent, rc = rc) @@ -427,6 +427,7 @@ class UpdateEECertificatesTask(AbstractTask): for r_pdu in r_msg: gski = r_pdu.get("gski") ees = existing.pop(gski, ()) + resources = rpki.resource_set.resource_bag( asn = rpki.resource_set.resource_set_as(r_pdu.get("asn")), v4 = rpki.resource_set.resource_set_ipv4(r_pdu.get("ipv4")), diff --git a/rpki/rpkidb/models.py b/rpki/rpkidb/models.py index 62deeb8b..2693064a 100644 --- a/rpki/rpkidb/models.py +++ b/rpki/rpkidb/models.py @@ -519,7 +519,7 @@ class Parent(models.Model): @tornado.gen.coroutine def xml_pre_delete_hook(self, rpkid): - self.destroy(rpkid, delete_parent = False) + yield self.destroy(rpkid, delete_parent = False) @tornado.gen.coroutine def xml_post_save_hook(self, rpkid, q_pdu): |