diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-17 15:18:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-17 15:18:17 +0000 |
| commit | fa6c93bd26d61e06c0030e475fbe9094520c89eb (patch) | |
| tree | e812ec6a105484f93ebaa6232c2b53654bfe4053 /synapse/storage | |
| parent | Change some debug logging to info (diff) | |
| parent | We do want to consumeError (diff) | |
| download | synapse-fa6c93bd26d61e06c0030e475fbe9094520c89eb.tar.xz | |
Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/roommember.py | 2 |
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] |