mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-29 15:39:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move FEDERATION_PING_INTERVAL timer. Update log line

Browse source
This commit is contained in:
Erik Johnston 2016-09-23 15:43:34 +01:00
parent 22578545a0
commit 655891d179
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
synapse/handlers/typing.py
View file

@ -53,7 +53,7 @@ class TypingHandler(object):
self.hs = hs self.hs = hs
self.clock = hs.get_clock() self.clock = hs.get_clock()
self.wheel_timer = WheelTimer() self.wheel_timer = WheelTimer(bucket_size=5000)
self.federation = hs.get_replication_layer() self.federation = hs.get_replication_layer()
@ -76,7 +76,7 @@ class TypingHandler(object):
) )
def _handle_timeouts(self): def _handle_timeouts(self):
logger.info("Handling typing timeout") logger.info("Checking for typing timeouts")
now = self.clock.time_msec() now = self.clock.time_msec()
@ -136,12 +136,6 @@ class TypingHandler(object):
then=now + timeout, then=now + timeout,
) )
self.wheel_timer.insert(
now=now,
obj=member,
then=now + FEDERATION_PING_INTERVAL,
)
if was_present: if was_present:
# No point sending another notification # No point sending another notification
defer.returnValue(None) defer.returnValue(None)
@ -208,6 +202,14 @@ class TypingHandler(object):
def _push_remote(self, member, typing): def _push_remote(self, member, typing):
users = yield self.state.get_current_user_in_room(member.room_id) users = yield self.state.get_current_user_in_room(member.room_id)
self._member_last_federation_poke[member] = self.clock.time_msec() self._member_last_federation_poke[member] = self.clock.time_msec()
now = self.clock.time_msec()
self.wheel_timer.insert(
now=now,
obj=member,
then=now + FEDERATION_PING_INTERVAL,
)
for domain in set(get_domain_from_id(u) for u in users): for domain in set(get_domain_from_id(u) for u in users):
if domain != self.server_name: if domain != self.server_name:
self.federation.send_edu( self.federation.send_edu(