summary refs log tree commit diff
path: root/synapse/util/logcontext.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-11 09:34:12 +0100
committerGitHub <noreply@github.com>2016-08-11 09:34:12 +0100
commit5202679edc29afe96f8c9ac3addff0b0a8bcfaac (patch)
treecde98e790b3db1a48036b65e971d95758cad847a /synapse/util/logcontext.py
parentMerge pull request #999 from matrix-org/erikj/measure_more (diff)
parentPEP8 (diff)
downloadsynapse-5202679edc29afe96f8c9ac3addff0b0a8bcfaac.tar.xz
Merge pull request #1000 from matrix-org/erikj/contexts
Clean up TransactionQueue
Diffstat (limited to 'synapse/util/logcontext.py')
-rw-r--r--synapse/util/logcontext.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py

index 5316259d15..7a87045f87 100644 --- a/synapse/util/logcontext.py +++ b/synapse/util/logcontext.py
@@ -317,7 +317,6 @@ def preserve_fn(f): def g(*args, **kwargs): with PreserveLoggingContext(current): return f(*args, **kwargs) - return g