summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-27 11:47:21 +0100
committerGitHub <noreply@github.com>2018-04-27 11:47:21 +0100
commit53494c34df323db5e5319f5594d64ff1d9c2bb33 (patch)
treef229d34ab66d4bb9275db27fd7ab92a8cc71a22b /synapse/push
parentMerge tag 'v0.28.0' (diff)
parentAdd missing consumeErrors (diff)
downloadsynapse-53494c34df323db5e5319f5594d64ff1d9c2bb33.tar.xz
Merge pull request #3139 from matrix-org/rav/consume_errors
Add missing consumeErrors to improve exception handling
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/pusherpool.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index 134e89b371..2f467d1f9c 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -142,7 +142,9 @@ class PusherPool:
                             )
                         )
 
-            yield make_deferred_yieldable(defer.gatherResults(deferreds))
+            yield make_deferred_yieldable(
+                defer.gatherResults(deferreds, consumeErrors=True),
+            )
         except Exception:
             logger.exception("Exception in pusher on_new_notifications")
 
@@ -167,7 +169,9 @@ class PusherPool:
                             preserve_fn(p.on_new_receipts)(min_stream_id, max_stream_id)
                         )
 
-            yield make_deferred_yieldable(defer.gatherResults(deferreds))
+            yield make_deferred_yieldable(
+                defer.gatherResults(deferreds, consumeErrors=True),
+            )
         except Exception:
             logger.exception("Exception in pusher on_new_receipts")