paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 08:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

event_queue: Rename ClientDescriptor.idle to expired.

Browse Source 
This better reflects the situation with these event queues -- they're
not idle, they are expired and to be garbage collected.
This commit is contained in:
Tim Abbott
2018-12-05 14:42:06 -08:00
parent 408af032a0
commit 6dd69b9bff
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/tornado/event_queue.py
View File

@@ -180,7 +180,7 @@ class ClientDescriptor:
def accepts_messages(self) -> bool: def accepts_messages(self) -> bool:
return self.event_types is None or "message" in self.event_types return self.event_types is None or "message" in self.event_types
def idle(self, now: float) -> bool: def expired(self, now: float) -> bool:
return (self.current_handler_id is None and return (self.current_handler_id is None and
now - self.last_connection_time >= self.queue_timeout) now - self.last_connection_time >= self.queue_timeout)
@@ -398,18 +398,18 @@ def gc_event_queues(port: int) -> None:
affected_users = set() # type: Set[int] affected_users = set() # type: Set[int]
affected_realms = set() # type: Set[int] affected_realms = set() # type: Set[int]
for (id, client) in clients.items(): for (id, client) in clients.items():
if client.idle(start): if client.expired(start):
to_remove.add(id) to_remove.add(id)
affected_users.add(client.user_profile_id) affected_users.add(client.user_profile_id)
affected_realms.add(client.realm_id) affected_realms.add(client.realm_id)
# We don't need to call e.g. finish_current_handler on the clients # We don't need to call e.g. finish_current_handler on the clients
# being removed because they are guaranteed to be idle and thus # being removed because they are guaranteed to be idle (because
# not have a current handler. # they are expired) and thus not have a current handler.
do_gc_event_queues(to_remove, affected_users, affected_realms) do_gc_event_queues(to_remove, affected_users, affected_realms)
if settings.PRODUCTION: if settings.PRODUCTION:
logging.info(('Tornado %d removed %d idle event queues owned by %d users in %.3fs.' + logging.info(('Tornado %d removed %d expired event queues owned by %d users in %.3fs.' +
' Now %d active queues, %s') ' Now %d active queues, %s')
% (port, len(to_remove), len(affected_users), time.time() - start, % (port, len(to_remove), len(affected_users), time.time() - start,
len(clients), handler_stats_string())) len(clients), handler_stats_string()))