OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #844 from matrix-org/markjh/yield_on_sleep 

Yield on the sleeps intended to backoff replication
pull/846/head
Mark Haines 2016-06-06 16:20:54 +01:00
parent 216a05b3e3 5ef84da4f1
commit 87f60e7053
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/app/pusher.py
View File

@ -311,7 +311,7 @@ class PusherServer(HomeServer):
poke_pushers(result) poke_pushers(result)
except: except:
logger.exception("Error replicating from %r", replication_url) logger.exception("Error replicating from %r", replication_url)
sleep(30) yield sleep(30)
def setup(config_options): def setup(config_options):

2
synapse/app/synchrotron.py
View File

@ -443,7 +443,7 @@ class SynchrotronServer(HomeServer):
notify(result) notify(result)
except: except:
logger.exception("Error replicating from %r", replication_url) logger.exception("Error replicating from %r", replication_url)
sleep(5) yield sleep(5)
def build_presence_handler(self): def build_presence_handler(self):
return SynchrotronPresence(self) return SynchrotronPresence(self)