diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-26 12:06:36 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-26 12:06:36 +0000 |
| commit | 48ee9ddb22b36f1adc23290e76287a922488596d (patch) | |
| tree | d9eccedd90f9c573634c5456cfbbb65684214c6e /synapse/util/async.py | |
| parent | Use tagged version of matrix-angular-sdk (diff) | |
| parent | Bump version numbers and change log (diff) | |
| download | synapse-48ee9ddb22b36f1adc23290e76287a922488596d.tar.xz | |
Merge branch 'release-v0.5.1' of github.com:matrix-org/synapse v0.5.1
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 |