Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Add fallback to last_active_ts if it beats the last sync time on a presence timeout. #2014

Merged
erikjohnston merged 3 commits into from
Mar 15, 2017
Merged

Add fallback to last_active_ts if it beats the last sync time on a presence timeout. #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebf5a6b
Add fallback to last_active_ts if it beats the last sync time.
Half-Shot Mar 15, 2017
e603205
Add a great comment to handle_timeout for active vs sync times.
Half-Shot Mar 15, 2017
c144292
Modify test_user_sync so it doesn't look at last_active_ts over last_…
Half-Shot Mar 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion synapse/handlers/presence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,10 @@ def handle_timeout(state, is_mine, syncing_user_ids, now):
# If there are have been no sync for a while (and none ongoing),
# set presence to offline
if user_id not in syncing_user_ids:
if now - state.last_user_sync_ts > SYNC_ONLINE_TIMEOUT:
# If the user has done something recently but hasn't synced,
Copy link
Copy Markdown
Member

@erikjohnston erikjohnston Mar 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you comment why we take the max please? kthx

Copy link
Copy Markdown
Collaborator Author

@Half-Shot Half-Shot Mar 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

# don't set them as offline.
sync_or_active = max(state.last_user_sync_ts, state.last_active_ts)
if now - sync_or_active > SYNC_ONLINE_TIMEOUT:
state = state.copy_and_replace(
state=PresenceState.OFFLINE,
status_msg=None,
Expand Down
2 changes: 1 addition & 1 deletion tests/handlers/test_presence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def test_sync_timeout(self):
state = UserPresenceState.default(user_id)
state = state.copy_and_replace(
state=PresenceState.ONLINE,
last_active_ts=now,
last_active_ts=0,
last_user_sync_ts=now - SYNC_ONLINE_TIMEOUT - 1,
)

Expand Down