diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-24 11:11:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 11:11:27 +0100 |
| commit | 69292de6ccd294c224956de36f2bf424edd6e91a (patch) | |
| tree | 2fbe0f15fe17c27664a6c4a7e0058e286bd6ed56 /synapse/storage | |
| parent | Merge pull request #3555 from matrix-org/erikj/client_apis_move (diff) | |
| parent | Merge branch 'develop' into rav/logcontext_fixes (diff) | |
| download | synapse-69292de6ccd294c224956de36f2bf424edd6e91a.tar.xz | |
Merge pull request #3591 from matrix-org/rav/logcontext_fixes
Logcontext fixes
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/events.py | 5 | ||||
| -rw-r--r-- | synapse/storage/pusher.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 392935cacf..4d0706f23d 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -39,7 +39,7 @@ from synapse.types import RoomStreamToken, get_domain_from_id from synapse.util.async import ObservableDeferred from synapse.util.caches.descriptors import cached, cachedInlineCallbacks from synapse.util.frozenutils import frozendict_json_encoder -from synapse.util.logcontext import make_deferred_yieldable +from synapse.util.logcontext import PreserveLoggingContext, make_deferred_yieldable from synapse.util.logutils import log_function from synapse.util.metrics import Measure @@ -147,7 +147,8 @@ class _EventPeristenceQueue(object): # callbacks on the deferred. try: ret = yield per_item_callback(item) - item.deferred.callback(ret) + with PreserveLoggingContext(): + item.deferred.callback(ret) except Exception: item.deferred.errback() finally: diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py index cc273a57b2..8443bd4c1b 100644 --- a/synapse/storage/pusher.py +++ b/synapse/storage/pusher.py @@ -233,7 +233,7 @@ class PusherStore(PusherWorkerStore): ) if newly_inserted: - self.runInteraction( + yield self.runInteraction( "add_pusher", self._invalidate_cache_and_stream, self.get_if_user_has_pusher, (user_id,) |