Преглед на файлове

Merge branch '3.0' of github.com:celery/celery into 3.0

Ask Solem преди 12 години
родител
ревизия
ff51b0b9d9
променени са 1 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 5 2
      celery/worker/heartbeat.py

+ 5 - 2
celery/worker/heartbeat.py

@@ -9,7 +9,7 @@
 """
 """
 from __future__ import absolute_import
 from __future__ import absolute_import
 
 
-from .state import SOFTWARE_INFO
+from .state import SOFTWARE_INFO, active_requests, total_count
 
 
 
 
 class Heart(object):
 class Heart(object):
@@ -34,7 +34,10 @@ class Heart(object):
         self.eventer.on_disabled.add(self.stop)
         self.eventer.on_disabled.add(self.stop)
 
 
     def _send(self, event):
     def _send(self, event):
-        return self.eventer.send(event, freq=self.interval, **SOFTWARE_INFO)
+        return self.eventer.send(event, freq=self.interval,
+                                 active=len(active_requests),
+                                 processed=sum(total_count.itervalues()),
+                                 **SOFTWARE_INFO)
 
 
     def start(self):
     def start(self):
         if self.eventer.enabled:
         if self.eventer.enabled: