diff options
author | Erik Johnston <erik@matrix.org> | 2016-02-04 10:22:44 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-02-08 14:26:45 +0000 |
commit | 2c1fbea5319db2c64fa486adb32b5e66680b6daf (patch) | |
tree | f34fb636206664ffa531e30d703469ff1a6d3a19 /synapse/util/__init__.py | |
parent | Add metrics to pushers (diff) | |
download | synapse-2c1fbea5319db2c64fa486adb32b5e66680b6daf.tar.xz |
Fix up logcontexts
Diffstat (limited to 'synapse/util/__init__.py')
-rw-r--r-- | synapse/util/__init__.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 7566d9eb33..133671e238 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, PreserveLoggingContext +from synapse.util.logcontext import PreserveLoggingContext from twisted.internet import defer, reactor, task @@ -61,10 +61,8 @@ class Clock(object): *args: Postional arguments to pass to function. **kwargs: Key arguments to pass to function. """ - current_context = LoggingContext.current_context() - def wrapped_callback(*args, **kwargs): - with PreserveLoggingContext(current_context): + with PreserveLoggingContext(): callback(*args, **kwargs) with PreserveLoggingContext(): |