summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-06 16:05:28 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-06 16:05:28 +0100
commit5ef84da4f11f1b1cceb0c44d9867bb597ee68e64 (patch)
tree33a9fe75c45a412d0bff15495ddd911b201335d8 /synapse
parentMerge pull request #841 from matrix-org/erikj/event_counter (diff)
downloadsynapse-5ef84da4f11f1b1cceb0c44d9867bb597ee68e64.tar.xz
Yield on the sleeps intended to backoff replication
Diffstat (limited to '')
-rw-r--r--synapse/app/pusher.py2
-rw-r--r--synapse/app/synchrotron.py2
2 files changed, 2 insertions, 2 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):
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py
index aa81e1c5da..7273055cc1 100644
--- a/synapse/app/synchrotron.py
+++ b/synapse/app/synchrotron.py
@@ -443,7 +443,7 @@ class SynchrotronServer(HomeServer):
                 notify(result)
             except:
                 logger.exception("Error replicating from %r", replication_url)
-                sleep(5)
+                yield sleep(5)
 
     def build_presence_handler(self):
         return SynchrotronPresence(self)