diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-20 17:26:36 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-20 17:26:36 +0000 |
| commit | db9ce032a4223f44ff0d823f36515cefbb534bf5 (patch) | |
| tree | 95dfbfaac7947c2c7d575c8e6a825dadf8d0d4c9 /synapse/util | |
| parent | Use module loggers rather than the root logger. Exceptions caused by bad clie... (diff) | |
| download | synapse-db9ce032a4223f44ff0d823f36515cefbb534bf5.tar.xz | |
Fix pep8 codestyle warnings
Diffstat (limited to 'synapse/util')
| -rw-r--r-- | synapse/util/__init__.py | 1 | ||||
| -rw-r--r-- | synapse/util/async.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index e57fb0e914..7ec5033ceb 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -37,6 +37,7 @@ class Clock(object): def call_later(self, delay, callback): current_context = LoggingContext.current_context() + def wrapped_callback(): LoggingContext.thread_local.current_context = current_context callback() diff --git a/synapse/util/async.py b/synapse/util/async.py index 1219d927db..7dd3ec3a72 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py @@ -18,6 +18,7 @@ from twisted.internet import defer, reactor from .logcontext import PreserveLoggingContext + @defer.inlineCallbacks def sleep(seconds): d = defer.Deferred() @@ -25,6 +26,7 @@ def sleep(seconds): with PreserveLoggingContext(): yield d + def run_on_reactor(): """ This will cause the rest of the function to be invoked upon the next iteration of the main loop |