diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-30 17:03:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-30 17:03:59 +0100 |
| commit | b282fe7170142191c8ce795270422754ab4bc58e (patch) | |
| tree | ac3c2c80bb9dec55ee142c4a259384607b4f6e49 | |
| parent | Doc new instance variables (diff) | |
| download | synapse-b282fe7170142191c8ce795270422754ab4bc58e.tar.xz | |
Revert log context change
Diffstat (limited to '')
| -rw-r--r-- | synapse/util/logcontext.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py index 183d9cf62f..857afee7cb 100644 --- a/synapse/util/logcontext.py +++ b/synapse/util/logcontext.py @@ -315,9 +315,6 @@ def preserve_context_over_deferred(deferred, context=None): the deferred follow the synapse logcontext rules: try ``make_deferred_yieldable`` instead. """ - if not isinstance(deferred, defer.Deferred): - return deferred - if context is None: context = LoggingContext.current_context() d = _PreservingContextDeferred(context) |