summary refs log tree commit diff
path: root/synapse/storage/roommember.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 15:18:17 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 15:18:17 +0000
commitfa6c93bd26d61e06c0030e475fbe9094520c89eb (patch)
treee812ec6a105484f93ebaa6232c2b53654bfe4053 /synapse/storage/roommember.py
parentChange some debug logging to info (diff)
parentWe do want to consumeError (diff)
downloadsynapse-fa6c93bd26d61e06c0030e475fbe9094520c89eb.tar.xz
Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/storage/roommember.py')
-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]