diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-08-25 18:34:46 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-08-25 18:34:46 +0100 |
| commit | ab34fdecb777b057a0ec307328f309bb2bdee05c (patch) | |
| tree | 541dc61435b893897e7a46d8f0a69443e18233d7 /synapse/handlers/typing.py | |
| parent | Add some TODOs (diff) | |
| parent | Merge pull request #1041 from matrix-org/paul/third-party-lookup (diff) | |
| download | synapse-ab34fdecb777b057a0ec307328f309bb2bdee05c.tar.xz | |
Merge branch 'develop' into markjh/direct_to_device
Diffstat (limited to 'synapse/handlers/typing.py')
| -rw-r--r-- | synapse/handlers/typing.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py index 5589296c09..46181984c0 100644 --- a/synapse/handlers/typing.py +++ b/synapse/handlers/typing.py @@ -16,7 +16,9 @@ from twisted.internet import defer from synapse.api.errors import SynapseError, AuthError -from synapse.util.logcontext import PreserveLoggingContext +from synapse.util.logcontext import ( + PreserveLoggingContext, preserve_fn, preserve_context_over_deferred, +) from synapse.util.metrics import Measure from synapse.types import UserID @@ -169,13 +171,13 @@ class TypingHandler(object): deferreds = [] for domain in domains: if domain == self.server_name: - self._push_update_local( + preserve_fn(self._push_update_local)( room_id=room_id, user_id=user_id, typing=typing ) else: - deferreds.append(self.federation.send_edu( + deferreds.append(preserve_fn(self.federation.send_edu)( destination=domain, edu_type="m.typing", content={ @@ -185,7 +187,9 @@ class TypingHandler(object): }, )) - yield defer.DeferredList(deferreds, consumeErrors=True) + yield preserve_context_over_deferred( + defer.DeferredList(deferreds, consumeErrors=True) + ) @defer.inlineCallbacks def _recv_edu(self, origin, content): |