Browse Source

Fix a bug in the estimate remaining time part.

Ask Solem 15 năm trước cách đây
mục cha
commit
d58005cfd4
3 tập tin đã thay đổi với 4 bổ sung5 xóa
  1. 2 3
      celery/beat.py
  2. 1 1
      celery/task/base.py
  3. 1 1
      celery/task/builtins.py

+ 2 - 3
celery/beat.py

@@ -82,9 +82,8 @@ class Scheduler(UserDict):
                 result = self.apply_async(entry)
                 self.logger.debug("Scheduler: %s sent. id->%s" % (
                         entry.name, result.task_id))
-            else:
-                if remaining:
-                    remaining_times.append(remaining)
+            if remaining:
+                remaining_times.append(remaining)
 
         return min(remaining_times or [self.interval])
 

+ 1 - 1
celery/task/base.py

@@ -587,7 +587,7 @@ class PeriodicTask(Task):
 
     def remaining_estimate(self, last_run_at):
         rem = (last_run_at + self.run_every) - datetime.now()
-        if not rem.days:
+        if rem.days == -1:
             return 0
         return rem.seconds + (rem.microseconds / 10e5)
 

+ 1 - 1
celery/task/builtins.py

@@ -13,7 +13,7 @@ class DeleteExpiredTaskMetaTask(PeriodicTask):
 
     """
     name = "celery.delete_expired_task_meta"
-    run_every = timedelta(days=1)
+    run_every = timedelta(minutes=1)
 
     def run(self, **kwargs):
         """The method run by ``celeryd``."""