summary refs log tree commit diff
path: root/synapse/app/pusher.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-07 11:07:27 +0100
committerErik Johnston <erik@matrix.org>2016-06-07 11:07:27 +0100
commitdbd788c2621d3f6af3dfe1624f81858ea561fcc5 (patch)
tree99a1c75673f8dc629b1405a1a1ebf5caa3823468 /synapse/app/pusher.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/timings (diff)
parentFix AS retries, but with correct ordering (diff)
downloadsynapse-dbd788c2621d3f6af3dfe1624f81858ea561fcc5.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings github/erikj/timings erikj/timings
Diffstat (limited to 'synapse/app/pusher.py')
-rw-r--r--synapse/app/pusher.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py
index f1de1e7ce9..3c3fa38053 100644
--- a/synapse/app/pusher.py
+++ b/synapse/app/pusher.py
@@ -311,7 +311,7 @@ class PusherServer(HomeServer):
                 poke_pushers(result)
             except:
                 logger.exception("Error replicating from %r", replication_url)
-                sleep(30)
+                yield sleep(30)
 
 
 def setup(config_options):