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

Merge pull request #1072 from matrix-org/erikj/presence_fiddle 

Fiddle should_notify to better report stats
This commit is contained in:
Erik Johnston 2016-09-06 10:57:48 +01:00 committed by GitHub
parent 9b69c85f7c 438ef47637
commit 2eed4d7af4
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
synapse/handlers/presence.py
View File

@ -941,33 +941,31 @@ class PresenceHandler(object):
def should_notify(old_state, new_state): def should_notify(old_state, new_state):
"""Decides if a presence state change should be sent to interested parties. """Decides if a presence state change should be sent to interested parties.
""" """
if old_state == new_state:
return False
if old_state.status_msg != new_state.status_msg: if old_state.status_msg != new_state.status_msg:
notify_reason_counter.inc("status_msg_change") notify_reason_counter.inc("status_msg_change")
return True return True
if old_state.state == PresenceState.ONLINE: if old_state.state != new_state.state:
if new_state.state != PresenceState.ONLINE: notify_reason_counter.inc("state_change")
# Always notify for online -> anything return True
notify_reason_counter.inc("online_to_not")
return True
if old_state.state == PresenceState.ONLINE:
if new_state.currently_active != old_state.currently_active: if new_state.currently_active != old_state.currently_active:
notify_reason_counter.inc("current_active_change") notify_reason_counter.inc("current_active_change")
return True return True
if new_state.last_active_ts - old_state.last_active_ts > LAST_ACTIVE_GRANULARITY: if new_state.last_active_ts - old_state.last_active_ts > LAST_ACTIVE_GRANULARITY:
# Only notify about last active bumps if we're not currently acive # Only notify about last active bumps if we're not currently acive
if not (old_state.currently_active and new_state.currently_active): if not new_state.currently_active:
notify_reason_counter.inc("last_active_change") notify_reason_counter.inc("last_active_change_online")
return True return True
elif new_state.last_active_ts - old_state.last_active_ts > LAST_ACTIVE_GRANULARITY: elif new_state.last_active_ts - old_state.last_active_ts > LAST_ACTIVE_GRANULARITY:
# Always notify for a transition where last active gets bumped. # Always notify for a transition where last active gets bumped.
notify_reason_counter.inc("last_active_change") notify_reason_counter.inc("last_active_change_not_online")
return True
if old_state.state != new_state.state:
notify_reason_counter.inc("state_change")
return True return True
return False return False