Browse Source

Adds TaskPool.readers/.writers instead of .eventmap

Ask Solem 13 years ago
parent
commit
e6c9f14bb5
2 changed files with 18 additions and 4 deletions
  1. 8 1
      celery/concurrency/base.py
  2. 10 3
      celery/concurrency/processes/__init__.py

+ 8 - 1
celery/concurrency/base.py

@@ -64,6 +64,9 @@ class BasePool(object):
     def on_start(self):
         pass
 
+    def did_start_ok(self):
+        return True
+
     def on_stop(self):
         pass
 
@@ -131,7 +134,11 @@ class BasePool(object):
         return self.limit
 
     @property
-    def eventmap(self):
+    def readers(self):
+        return {}
+
+    @property
+    def writers(self):
         return {}
 
     @property

+ 10 - 3
celery/concurrency/processes/__init__.py

@@ -69,6 +69,9 @@ class TaskPool(BasePool):
                                **self.options)
         self.on_apply = self._pool.apply_async
 
+    def did_start_ok(self):
+        return self._pool.did_start_ok()
+
     def on_stop(self):
         """Gracefully stop the pool."""
         if self._pool is not None and self._pool._state in (RUN, CLOSE):
@@ -129,9 +132,13 @@ class TaskPool(BasePool):
         return self._pool._processes
 
     @property
-    def eventmap(self):
-        return self._pool.eventmap
+    def readers(self):
+        return self._pool.readers
+
+    @property
+    def writers(self):
+        return self._pool.writers
 
     @property
     def timers(self):
-        return self._pool.timers
+        return {self._pool.maintain_pool: 30}