Merge branch 'erikj/presence_coount' of github.com:matrix-org/synapse into erikj/timings

This commit is contained in:
Erik Johnston 2016-06-03 13:49:33 +01:00
commit df6cf1600a

View file

@ -50,8 +50,7 @@ timers_fired_counter = metrics.register_counter("timers_fired")
federation_presence_counter = metrics.register_counter("federation_presence")
bump_active_time_counter = metrics.register_counter("bump_active_time")
full_update_presence_counter = metrics.register_counter("full_update_presence")
partial_update_presence_counter = metrics.register_counter("partial_update_presence")
get_updates_counter = metrics.register_counter("get_updates", labels=["type"])
# If a user was last active in the last LAST_ACTIVE_GRANULARITY, consider them
@ -980,10 +979,10 @@ class PresenceEventSource(object):
if from_key:
changed = stream_change_cache.get_all_entities_changed(from_key)
if changed is not None and len(changed) < 100:
if changed is not None and len(changed) < 500:
# For small deltas, its quicker to get all changes and then
# work out if we share a room or they're in our presence list
partial_update_presence_counter.inc()
get_updates_counter.inc("stream")
for other_user_id in changed:
if other_user_id in friends:
user_ids_changed.add(other_user_id)
@ -995,7 +994,7 @@ class PresenceEventSource(object):
else:
# Too many possible updates. Find all users we can see and check
# if any of them have changed.
full_update_presence_counter.inc()
get_updates_counter.inc("full")
user_ids_to_check = set()
for room_id in room_ids: