소스 검색

task-accepted event renamed to task-started. Thanks to runeh.

Ask Solem 15 년 전
부모
커밋
42121b48d5
2개의 변경된 파일7개의 추가작업 그리고 6개의 파일을 삭제
  1. 6 5
      celery/events/state.py
  2. 1 1
      celery/worker/job.py

+ 6 - 5
celery/events/state.py

@@ -36,7 +36,8 @@ class Worker(Thing):
         self._heartpush(timestamp)
 
     def _heartpush(self, timestamp):
-        heapq.heappush(self.heartbeats, timestamp)
+        if timestamp:
+            heapq.heappush(self.heartbeats, timestamp)
 
     @property
     def alive(self):
@@ -52,7 +53,7 @@ class Task(Thing):
     name = None
     state = states.PENDING
     received = False
-    accepted = False
+    started = False
     args = None
     kwargs = None
     eta = None
@@ -83,9 +84,9 @@ class Task(Thing):
         self.state = "RECEIVED"
         self.update(fields, timestamp=timestamp)
 
-    def accepted(self, timestamp=None, **fields):
-        self.state = "ACCEPTED"
-        self.accepted = timestamp
+    def started(self, timestamp=None, **fields):
+        self.state = states.STARTED
+        self.started = timestamp
         self.update(fields)
 
     def failed(self, timestamp=None, **fields):

+ 1 - 1
celery/worker/job.py

@@ -350,7 +350,7 @@ class TaskWrapper(object):
     def on_accepted(self):
         if not self.task.acks_late:
             self.acknowledge()
-        self.send_event("task-accepted", uuid=self.task_id)
+        self.send_event("task-started", uuid=self.task_id)
         self.logger.debug("Task accepted: %s[%s]" % (
             self.task_name, self.task_id))