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/message.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/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 22e19af17f..b7d52647d7 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -20,6 +20,7 @@ from synapse.api.errors import RoomError, SynapseError from synapse.streams.config import PaginationConfig from synapse.events.utils import serialize_event from synapse.events.validator import EventValidator +from synapse.util import unwrapFirstError from synapse.util.logcontext import PreserveLoggingContext from synapse.types import UserID @@ -303,7 +304,7 @@ class MessageHandler(BaseHandler): event.room_id ), ] - ) + ).addErrback(unwrapFirstError) start_token = now_token.copy_and_replace("room_key", token[0]) end_token = now_token.copy_and_replace("room_key", token[1]) @@ -328,7 +329,7 @@ class MessageHandler(BaseHandler): yield defer.gatherResults( [handle_room(e) for e in room_list], consumeErrors=True - ) + ).addErrback(unwrapFirstError) ret = { "rooms": rooms_ret, |