Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Up replication ping timeout

This commit is contained in:
Erik Johnston 2017-04-10 11:32:05 +01:00
parent 0cd01f5c9c
commit 0364d23210
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/replication/tcp/protocol.py
View File

@ -85,6 +85,8 @@ logger = logging.getLogger(__name__)
PING_TIME = 5000 PING_TIME = 5000
PING_TIMEOUT_MULTIPLIER = 5
PING_TIMEOUT_MS = PING_TIME * PING_TIMEOUT_MULTIPLIER
class ConnectionStates(object): class ConnectionStates(object):
@ -166,7 +168,7 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver):
now = self.clock.time_msec() now = self.clock.time_msec()
if self.time_we_closed: if self.time_we_closed:
if now - self.time_we_closed > PING_TIME * 3: if now - self.time_we_closed > PING_TIMEOUT_MS:
logger.info( logger.info(
"[%s] Failed to close connection gracefully, aborting", self.id() "[%s] Failed to close connection gracefully, aborting", self.id()
) )
@ -175,7 +177,7 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver):
if now - self.last_sent_command >= PING_TIME: if now - self.last_sent_command >= PING_TIME:
self.send_command(PingCommand(now)) self.send_command(PingCommand(now))
if self.received_ping and now - self.last_received_command > PING_TIME * 3: if self.received_ping and now - self.last_received_command > PING_TIMEOUT_MS:
logger.info( logger.info(
"[%s] Connection hasn't received command in %r ms. Closing.", "[%s] Connection hasn't received command in %r ms. Closing.",
self.id(), now - self.last_received_command self.id(), now - self.last_received_command