diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-08 16:32:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-08 16:32:18 +0100 |
| commit | 476899295f5fd6cff64799bcbc84cd4bf9005e33 (patch) | |
| tree | cacce7f0de3c1b694cce8c805c21c297cfbdeb76 /synapse/util/__init__.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-476899295f5fd6cff64799bcbc84cd4bf9005e33.tar.xz | |
Change the way we do logging contexts so that they survive divergences
Diffstat (limited to 'synapse/util/__init__.py')
| -rw-r--r-- | synapse/util/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 79109d0b19..364b927851 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.util.logcontext import LoggingContext +from synapse.util.logcontext import LoggingContext, PreserveLoggingContext from twisted.internet import defer, reactor, task @@ -50,8 +50,10 @@ class Clock(object): current_context = LoggingContext.current_context() def wrapped_callback(): - LoggingContext.thread_local.current_context = current_context - callback() + with PreserveLoggingContext(): + LoggingContext.thread_local.current_context = current_context + callback() + return reactor.callLater(delay, wrapped_callback) def cancel_call_later(self, timer): |