diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-12 13:14:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-12 13:14:29 +0100 |
| commit | 95dedb866f04ee4ae034c35130f2a8dc86243fbb (patch) | |
| tree | 80080d23bffdfd8badb1d4b56cb4dc4884a61d4b /synapse/handlers/room.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/logging_co... (diff) | |
| download | synapse-95dedb866f04ee4ae034c35130f2a8dc86243fbb.tar.xz | |
Unwrap defer.gatherResults failures
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index cfa2e38ed2..ea5abba6ab 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -21,7 +21,7 @@ from ._base import BaseHandler from synapse.types import UserID, RoomAlias, RoomID from synapse.api.constants import EventTypes, Membership, JoinRules from synapse.api.errors import StoreError, SynapseError -from synapse.util import stringutils +from synapse.util import stringutils, unwrapFirstError from synapse.util.async import run_on_reactor from synapse.events.utils import serialize_event @@ -537,7 +537,7 @@ class RoomListHandler(BaseHandler): for room in chunk ], consumeErrors=True, - ) + ).addErrback(unwrapFirstError) for i, room in enumerate(chunk): room["num_joined_members"] = len(results[i]) |