OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert log context change

pull/2075/head
Erik Johnston 2017-03-30 17:03:59 +01:00
parent 6194a64ae9
commit b282fe7170
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/util/logcontext.py
View File

@ -315,9 +315,6 @@ def preserve_context_over_deferred(deferred, context=None):
the deferred follow the synapse logcontext rules: try the deferred follow the synapse logcontext rules: try
``make_deferred_yieldable`` instead. ``make_deferred_yieldable`` instead.
""" """
if not isinstance(deferred, defer.Deferred):
return deferred
if context is None: if context is None:
context = LoggingContext.current_context() context = LoggingContext.current_context()
d = _PreservingContextDeferred(context) d = _PreservingContextDeferred(context)