소스 검색

Cosmetic changes

Ask Solem 15 년 전
부모
커밋
cb92fb8471
1개의 변경된 파일10개의 추가작업 그리고 10개의 파일을 삭제
  1. 10 10
      celery/monitoring/__init__.py

+ 10 - 10
celery/monitoring/__init__.py

@@ -6,25 +6,28 @@ from celery.monitoring.web import WebServerThread
 
 
 
 
 class MonitorListener(object):
 class MonitorListener(object):
+    """Capture events sent by messages and store them in memory."""
 
 
     def __init__(self, state):
     def __init__(self, state):
         self.connection = DjangoBrokerConnection()
         self.connection = DjangoBrokerConnection()
         self.receiver = EventReceiver(self.connection, handlers={
         self.receiver = EventReceiver(self.connection, handlers={
-            "worker-heartbeat": state.receive_heartbeat,
-            "worker-online": state.receive_worker_event,
-            "worker-offline": state.receive_worker_event,
             "task-received": state.receive_task_received,
             "task-received": state.receive_task_received,
             "task-accepted": state.receive_task_event,
             "task-accepted": state.receive_task_event,
             "task-succeeded": state.receive_task_event,
             "task-succeeded": state.receive_task_event,
-            "task-failed": state.receive_task_event,
             "task-retried": state.receive_task_event
             "task-retried": state.receive_task_event
+            "task-failed": state.receive_task_event,
+            "worker-online": state.receive_worker_event,
+            "worker-offline": state.receive_worker_event,
+            "worker-heartbeat": state.receive_heartbeat,
         })
         })
 
 
     def start(self):
     def start(self):
-        self.receiver.consume()
+        self.receiver.capture()
 
 
 
 
 class MonitorService(object):
 class MonitorService(object):
+    """celerymon"""
+
 
 
     def __init__(self, logger, is_detached=False, http_port=8989):
     def __init__(self, logger, is_detached=False, http_port=8989):
         self.logger = logger
         self.logger = logger
@@ -32,8 +35,5 @@ class MonitorService(object):
         self.http_port = http_port
         self.http_port = http_port
 
 
     def start(self):
     def start(self):
-        listener = MonitorListener(monitor_state)
-        webthread = WebServerThread(port=self.http_port)
-        webthread.start()
-
-        listener.start()
+        MonitorListener(monitor_state).start()
+        WebServerThread(port=self.http_port).start()