Pārlūkot izejas kodu

AMQP Backend: Don't silence exceptions occurring while sending results, but propogate them.

Ask Solem 15 gadi atpakaļ
vecāks
revīzija
111a2bd765
1 mainītis faili ar 1 papildinājumiem un 12 dzēšanām
  1. 1 12
      celery/backends/amqp.py

+ 1 - 12
celery/backends/amqp.py

@@ -22,10 +22,6 @@ def repair_uuid(s):
     return "%s-%s-%s-%s-%s" % (s[:8], s[8:12], s[12:16], s[16:20], s[20:])
     return "%s-%s-%s-%s-%s" % (s[:8], s[8:12], s[12:16], s[16:20], s[20:])
 
 
 
 
-class AMQResultWarning(UserWarning):
-    pass
-
-
 class AMQPBackend(BaseDictBackend):
 class AMQPBackend(BaseDictBackend):
     """AMQP backend. Publish results by sending messages to the broker
     """AMQP backend. Publish results by sending messages to the broker
     using the task id as routing key.
     using the task id as routing key.
@@ -125,18 +121,11 @@ class AMQPBackend(BaseDictBackend):
 
 
         conn = self.pool.acquire(block=True)
         conn = self.pool.acquire(block=True)
         try:
         try:
-            try:
-                conn.ensure(self, self._publish_result,
+            conn.ensure(self, self._publish_result,
                         max_retries=max_retries,
                         max_retries=max_retries,
                         interval_start=interval_start,
                         interval_start=interval_start,
                         interval_step=interval_step,
                         interval_step=interval_step,
                         interval_max=interval_max)(conn, task_id, meta)
                         interval_max=interval_max)(conn, task_id, meta)
-            except Exception, exc:
-                raise
-                if not max_retries:
-                    raise
-                warnings.warn(AMQResultWarning(
-                    "Error sending result %s: %r" % (task_id, exc)))
         finally:
         finally:
             conn.release()
             conn.release()