Browse Source

Hold on a bit with E_WOULDBLOCK error

Ask Solem 11 years ago
parent
commit
74663dad46
2 changed files with 1 additions and 7 deletions
  1. 0 6
      Changelog
  2. 1 1
      celery/result.py

+ 0 - 6
Changelog

@@ -25,12 +25,6 @@ new in Celery 3.1.
 
     Fix contributed by j0hnsmith
 
-- Worker now raises :exc:`RuntimeError` if task calls ``result.get()``
-  and the call will block.
-
-    The call will not block if using the eventlet/gevent pools,
-    so the error will not be raised there.
-
 - Prefork pool: Now using ``_multiprocessing.read`` with ``memoryview``
   if available.
 

+ 1 - 1
celery/result.py

@@ -36,7 +36,7 @@ See http://docs.celeryq.org/en/latest/userguide/tasks.html\
 
 def assert_will_not_block():
     if task_join_will_block():
-        raise Exception(E_WOULDBLOCK)
+        pass   # TODO future version: raise
 
 
 class ResultBase(object):