X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/99f6dd4f1ff0390de9a9bbd4e3352b953cb9a235..f82c33291d3bf97d7447aba236940bdfe560f703:/apps/waiter/models.py?ds=sidebyside diff --git a/apps/waiter/models.py b/apps/waiter/models.py index 8b6ff94e5..bffaf7f8a 100644 --- a/apps/waiter/models.py +++ b/apps/waiter/models.py @@ -19,7 +19,7 @@ class WaitedFile(models.Model): @classmethod def exists(cls, path): """Returns opened file or None. - + `path` is relative to WAITER_ROOT. Won't open a path leading outside of WAITER_ROOT. """ @@ -39,14 +39,6 @@ class WaitedFile(models.Model): cls.objects.count() < WAITER_MAX_QUEUE ) - def is_stale(self): - if self.task is None: - # Race; just let the other task roll. - return False - if self.task.status not in (u'PENDING', u'STARTED', u'SUCCESS', u'RETRY'): - return True - return False - @classmethod def order(cls, path, task_creator, description=None): """ @@ -61,7 +53,7 @@ class WaitedFile(models.Model): if not already: waited, created = cls.objects.get_or_create(path=path) if created or waited.is_stale(): - waited.task = task_creator(check_abspath(path)) + waited.task = task_creator(check_abspath(path), waited.pk) waited.task_id = waited.task.task_id waited.description = description waited.save()