Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 09:56:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into request_logging

Browse source 
Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py
This commit is contained in:
Mark Haines 2014-11-14 11:16:50 +00:00
commit e903c941cb
208 changed files with 8887 additions and 19461 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/util/async.py
View file

@ -24,3 +24,9 @@ def sleep(seconds):
reactor.callLater(seconds, d.callback, 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
"""
return sleep(0)