diff options
author | David Baker <dbkr@matrix.org> | 2014-11-20 18:17:46 +0000 |
---|---|---|
committer | David Baker <dbkr@matrix.org> | 2014-11-20 18:17:46 +0000 |
commit | 23465a30b65808a75afa5cb98bcd1131a2a2c984 (patch) | |
tree | dcd987034fefbb2649da8346bf36c9d9ded25acc /synapse/util/async.py | |
parent | Merge branch 'http_client_refactor' into pushers (diff) | |
parent | Fix pep8 codestyle warnings (diff) | |
download | synapse-23465a30b65808a75afa5cb98bcd1131a2a2c984.tar.xz |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/util/async.py')
-rw-r--r-- | synapse/util/async.py | 2 |
1 files changed, 2 insertions, 0 deletions
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 |