summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 10:03:23 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 10:07:01 +0000
commit72a4de2ce627528a13bda480403344ffde6275d3 (patch)
tree0c295e05052a5f50be0f1447fe4f284b8c8e335d /synapse/storage
parentMerge pull request #73 from matrix-org/hotfixes-v0.7.0f (diff)
downloadsynapse-72a4de2ce627528a13bda480403344ffde6275d3.tar.xz
Use consumeErrors=True on all DeferredLists.
This is so that the DeferredLists actually consume the error instead of
propogating down the non-existent errback chain. This should reduce the
number of unhandled errors we are seeing.
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/roommember.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 779f9ce544..9bf608bc90 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -288,7 +288,7 @@ class RoomMemberStore(SQLBaseStore):
 
         deferreds = [self.get_rooms_for_user(u) for u in user_id_list]
 
-        results = yield defer.DeferredList(deferreds)
+        results = yield defer.DeferredList(deferreds, consumeErrors=True)
 
         # A list of sets of strings giving room IDs for each user
         room_id_lists = [set([r.room_id for r in result[1]]) for result in results]