Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove logging for #5407 and update comments

Browse Source
This commit is contained in:
Erik Johnston 2019-08-15 12:02:18 +01:00
parent 09f6152a11
commit 748aa38378
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
synapse/handlers/sync.py
View File

@ -786,9 +786,8 @@ class SyncHandler(object):
batch.events[0].event_id, state_filter=state_filter batch.events[0].event_id, state_filter=state_filter
) )
else: else:
# Its not clear how we get here, but empirically we do # We can get here if the user has ignored the senders of all
# (#5407). Logging has been added elsewhere to try and # the recent events.
# figure out where this state comes from.
state_at_timeline_start = yield self.get_state_at( state_at_timeline_start = yield self.get_state_at(
room_id, stream_position=now_token, state_filter=state_filter room_id, stream_position=now_token, state_filter=state_filter
) )
@ -1771,20 +1770,9 @@ class SyncHandler(object):
newly_joined_room=newly_joined, newly_joined_room=newly_joined,
) )
if not batch and batch.limited: # Note: `batch` can be both empty and limited here in the case where
# This resulted in #5407, which is weird, so lets log! We do it # `_load_filtered_recents` can't find any events the user should see
# here as we have the maximum amount of information. # (e.g. due to having ignored the sender of the last 50 events).
user_id = sync_result_builder.sync_config.user.to_string()
logger.info(
"Issue #5407: Found limited batch with no events. user %s, room %s,"
" sync_config %s, newly_joined %s, events %s, batch %s.",
user_id,
room_id,
sync_config,
newly_joined,
events,
batch,
)
if newly_joined: if newly_joined:
# debug for https://github.com/matrix-org/synapse/issues/4422 # debug for https://github.com/matrix-org/synapse/issues/4422