diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-06-06 16:20:54 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-06-06 16:20:54 +0100 |
| commit | 87f60e705345ca94f222d7d6b0757a31b7b23f1d (patch) | |
| tree | 175f9ffe10f3f87d46525461ff25d3762ed5df88 | |
| parent | .values() returns list of sets (diff) | |
| parent | Yield on the sleeps intended to backoff replication (diff) | |
| download | synapse-87f60e705345ca94f222d7d6b0757a31b7b23f1d.tar.xz | |
Merge pull request #844 from matrix-org/markjh/yield_on_sleep
Yield on the sleeps intended to backoff replication
| -rw-r--r-- | synapse/app/pusher.py | 2 | ||||
| -rw-r--r-- | synapse/app/synchrotron.py | 2 |
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) |