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

Merge pull request #600 from matrix-org/erikj/presence

Browse source 
Measure PresenceEventSource.get_new_events
This commit is contained in:
Erik Johnston 2016-02-23 14:54:26 +00:00
commit a7b2ce32f7
1 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
synapse/handlers/presence.py
View file

@ -46,6 +46,7 @@ logger = logging.getLogger(__name__)
metrics = synapse.metrics.get_metrics_for(__name__)
notified_presence_counter = metrics.register_counter("notified_presence")
federation_presence_out_counter = metrics.register_counter("federation_presence_out")
presence_updates_counter = metrics.register_counter("presence_updates")
timers_fired_counter = metrics.register_counter("timers_fired")
federation_presence_counter = metrics.register_counter("federation_presence")
@ -259,6 +260,8 @@ class PresenceHandler(BaseHandler):
if user_id not in to_notify
}
if to_federation_ping:
federation_presence_out_counter.inc_by(len(to_federation_ping))
_, _, hosts_to_states = yield self._get_interested_parties(
to_federation_ping.values()
)
@ -836,41 +839,42 @@ class PresenceEventSource(object):
# We don't try and limit the presence updates by the current token, as
# sending down the rare duplicate is not a concern.
user_id = user.to_string()
if from_key is not None:
from_key = int(from_key)
room_ids = room_ids or []
with Measure(self.clock, "presence.get_new_events"):
user_id = user.to_string()
if from_key is not None:
from_key = int(from_key)
room_ids = room_ids or []
presence = self.hs.get_handlers().presence_handler
presence = self.hs.get_handlers().presence_handler
if not room_ids:
rooms = yield self.store.get_rooms_for_user(user_id)
room_ids = set(e.room_id for e in rooms)
if not room_ids:
rooms = yield self.store.get_rooms_for_user(user_id)
room_ids = set(e.room_id for e in rooms)
user_ids_to_check = set()
for room_id in room_ids:
users = yield self.store.get_users_in_room(room_id)
user_ids_to_check.update(users)
user_ids_to_check = set()
for room_id in room_ids:
users = yield self.store.get_users_in_room(room_id)
user_ids_to_check.update(users)
plist = yield self.store.get_presence_list_accepted(user.localpart)
user_ids_to_check.update([row["observed_user_id"] for row in plist])
plist = yield self.store.get_presence_list_accepted(user.localpart)
user_ids_to_check.update([row["observed_user_id"] for row in plist])
# Always include yourself. Only really matters for when the user is
# not in any rooms, but still.
user_ids_to_check.add(user_id)
# Always include yourself. Only really matters for when the user is
# not in any rooms, but still.
user_ids_to_check.add(user_id)
max_token = self.store.get_current_presence_token()
max_token = self.store.get_current_presence_token()
if from_key:
user_ids_changed = self.store.presence_stream_cache.get_entities_changed(
user_ids_to_check, from_key,
)
else:
user_ids_changed = user_ids_to_check
if from_key:
user_ids_changed = self.store.presence_stream_cache.get_entities_changed(
user_ids_to_check, from_key,
)
else:
user_ids_changed = user_ids_to_check
updates = yield presence.current_state_for_users(user_ids_changed)
updates = yield presence.current_state_for_users(user_ids_changed)
now = self.clock.time_msec()
now = self.clock.time_msec()
defer.returnValue(([
{