Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
98780378
Commit
98780378
authored
9 years ago
by
Mark Haines
Browse files
Options
Downloads
Patches
Plain Diff
Fix some races in the synapse presence handler caused by not yielding on deferreds
parent
49ebd472
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
synapse/handlers/presence.py
+8
-3
8 additions, 3 deletions
synapse/handlers/presence.py
with
8 additions
and
3 deletions
synapse/handlers/presence.py
+
8
−
3
View file @
98780378
...
...
@@ -378,7 +378,7 @@ class PresenceHandler(BaseHandler):
# TODO(paul): perform a presence push as part of start/stop poll so
# we don't have to do this all the time
self
.
changed_presencelike_data
(
target_user
,
state
)
yield
self
.
changed_presencelike_data
(
target_user
,
state
)
def
bump_presence_active_time
(
self
,
user
,
now
=
None
):
if
now
is
None
:
...
...
@@ -422,12 +422,12 @@ class PresenceHandler(BaseHandler):
@log_function
def
started_user_eventstream
(
self
,
user
):
# TODO(paul): Use "last online" state
self
.
set_state
(
user
,
user
,
{
"
presence
"
:
PresenceState
.
ONLINE
})
return
self
.
set_state
(
user
,
user
,
{
"
presence
"
:
PresenceState
.
ONLINE
})
@log_function
def
stopped_user_eventstream
(
self
,
user
):
# TODO(paul): Save current state as "last online" state
self
.
set_state
(
user
,
user
,
{
"
presence
"
:
PresenceState
.
OFFLINE
})
return
self
.
set_state
(
user
,
user
,
{
"
presence
"
:
PresenceState
.
OFFLINE
})
@defer.inlineCallbacks
def
user_joined_room
(
self
,
user
,
room_id
):
...
...
@@ -1263,6 +1263,11 @@ class UserPresenceCache(object):
self
.
state
=
{
"
presence
"
:
PresenceState
.
OFFLINE
}
self
.
serial
=
None
def
__repr__
(
self
):
return
"
UserPresenceCache(state=%r, serial=%r)
"
%
(
self
.
state
,
self
.
serial
)
def
update
(
self
,
state
,
serial
):
assert
(
"
mtime_age
"
not
in
state
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment