diff options
| author | Rob Austein <sra@hactrn.net> | 2016-02-25 19:30:01 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-02-25 19:30:01 +0000 |
| commit | 5d6efe28e2560d4a6b7c752e57f6b667be34bcdc (patch) | |
| tree | 35758a8056023c6e8cba5557c0b3af381fb920f2 /rpki/rpkidb | |
| parent | cbc7f0f9e151af13398e4b3234a826d03bfcb6a9 (diff) | |
Major simplifcation of rpkid's internal tasking system.
svn path=/branches/tk705/; revision=6289
Diffstat (limited to 'rpki/rpkidb')
| -rw-r--r-- | rpki/rpkidb/models.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rpki/rpkidb/models.py b/rpki/rpkidb/models.py index 6b26a27d..b76c2e9a 100644 --- a/rpki/rpkidb/models.py +++ b/rpki/rpkidb/models.py @@ -378,10 +378,8 @@ class Tenant(models.Model): trace_call_chain() logger.debug("Forced immediate run of periodic actions for %r", self) tasks = self.cron_tasks(rpkid = rpkid) - rpkid.task_add(tasks) - futures = [task.wait() for task in tasks] - rpkid.task_run() - yield futures + rpkid.task_add(*tasks) + yield [task.wait() for task in tasks] def cron_tasks(self, rpkid): |