Merge pull request #2834 from matrix-org/rav/better_persist_event_exc…

…eption_handling Improve exception handling in persist_event
matrix-org · Jan 31, 2018 · 518a745 · 518a745
2 parents d1fe4db + b387ee1
commit 518a745
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
@@ -110,7 +110,7 @@ def add_to_queue(self, room_id, events_and_contexts, backfilled):
                 end_item.events_and_contexts.extend(events_and_contexts)
                 return end_item.deferred.observe()
 
-        deferred = ObservableDeferred(defer.Deferred())
+        deferred = ObservableDeferred(defer.Deferred(), consumeErrors=True)
 
         queue.append(self._EventPersistQueueItem(
             events_and_contexts=events_and_contexts,
@@ -152,8 +152,8 @@ def handle_queue_loop():
                     try:
                         ret = yield per_item_callback(item)
                         item.deferred.callback(ret)
-                    except Exception as e:
-                        item.deferred.errback(e)
+                    except Exception:
+                        item.deferred.errback()
             finally:
                 queue = self._event_persist_queues.pop(room_id, None)
                 if queue: