|
60 | 60 |
|
61 | 61 | logger = logging.getLogger(__name__)
|
62 | 62 |
|
63 |
| -# Debug logger for https://github.com/matrix-org/synapse/issues/4422 |
64 |
| -issue4422_logger = logging.getLogger("synapse.handler.sync.4422_debug") |
65 |
| - |
66 |
| - |
67 | 63 | # Counts the number of times we returned a non-empty sync. `type` is one of
|
68 | 64 | # "initial_sync", "full_state_sync" or "incremental_sync", `lazy_loaded` is
|
69 | 65 | # "true" or "false" depending on if the request asked for lazy loaded members or
|
@@ -1161,13 +1157,8 @@ async def generate_sync_result(
|
1161 | 1157 |
|
1162 | 1158 | num_events = 0
|
1163 | 1159 |
|
1164 |
| - # debug for https://github.com/matrix-org/synapse/issues/4422 |
| 1160 | + # debug for https://github.com/matrix-org/synapse/issues/9424 |
1165 | 1161 | for joined_room in sync_result_builder.joined:
|
1166 |
| - room_id = joined_room.room_id |
1167 |
| - if room_id in newly_joined_rooms: |
1168 |
| - issue4422_logger.debug( |
1169 |
| - "Sync result for newly joined room %s: %r", room_id, joined_room |
1170 |
| - ) |
1171 | 1162 | num_events += len(joined_room.timeline.events)
|
1172 | 1163 |
|
1173 | 1164 | log_kv(
|
@@ -1740,18 +1731,6 @@ async def _get_rooms_changed(
|
1740 | 1731 | old_mem_ev_id, allow_none=True
|
1741 | 1732 | )
|
1742 | 1733 |
|
1743 |
| - # debug for #4422 |
1744 |
| - if has_join: |
1745 |
| - prev_membership = None |
1746 |
| - if old_mem_ev: |
1747 |
| - prev_membership = old_mem_ev.membership |
1748 |
| - issue4422_logger.debug( |
1749 |
| - "Previous membership for room %s with join: %s (event %s)", |
1750 |
| - room_id, |
1751 |
| - prev_membership, |
1752 |
| - old_mem_ev_id, |
1753 |
| - ) |
1754 |
| - |
1755 | 1734 | if not old_mem_ev or old_mem_ev.membership != Membership.JOIN:
|
1756 | 1735 | newly_joined_rooms.append(room_id)
|
1757 | 1736 |
|
@@ -1893,13 +1872,6 @@ async def _get_rooms_changed(
|
1893 | 1872 | upto_token=since_token,
|
1894 | 1873 | )
|
1895 | 1874 |
|
1896 |
| - if newly_joined: |
1897 |
| - # debugging for https://github.com/matrix-org/synapse/issues/4422 |
1898 |
| - issue4422_logger.debug( |
1899 |
| - "RoomSyncResultBuilder events for newly joined room %s: %r", |
1900 |
| - room_id, |
1901 |
| - entry.events, |
1902 |
| - ) |
1903 | 1875 | room_entries.append(entry)
|
1904 | 1876 |
|
1905 | 1877 | return _RoomChanges(
|
@@ -2077,14 +2049,6 @@ async def _generate_room_entry(
|
2077 | 2049 | # `_load_filtered_recents` can't find any events the user should see
|
2078 | 2050 | # (e.g. due to having ignored the sender of the last 50 events).
|
2079 | 2051 |
|
2080 |
| - if newly_joined: |
2081 |
| - # debug for https://github.com/matrix-org/synapse/issues/4422 |
2082 |
| - issue4422_logger.debug( |
2083 |
| - "Timeline events after filtering in newly-joined room %s: %r", |
2084 |
| - room_id, |
2085 |
| - batch, |
2086 |
| - ) |
2087 |
| - |
2088 | 2052 | # When we join the room (or the client requests full_state), we should
|
2089 | 2053 | # send down any existing tags. Usually the user won't have tags in a
|
2090 | 2054 | # newly joined room, unless either a) they've joined before or b) the
|
|
0 commit comments