OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove debug changes

pull/10419/head
Eric Eastwood 2021-07-14 23:32:24 -05:00
parent 8999567de4
commit 35a4569ce6
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts-dev/complement.sh
View File

@ -65,4 +65,4 @@ if [[ -n "$1" ]]; then
fi fi
# Run the tests! # Run the tests!
go test -v -tags synapse_blacklist,msc2946,msc3083,msc2716,msc2403 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests -run TestBackfillingHistory/parallel/Historical_messages_are_visible_when_joining_on_federated_server_-_pre-made_insertion_event go test -v -tags synapse_blacklist,msc2946,msc3083,msc2716,msc2403 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests

14
synapse/events/utils.py
View File

@ -253,13 +253,13 @@ def format_event_for_client_v1(d):
def format_event_for_client_v2(d): def format_event_for_client_v2(d):
drop_keys = ( drop_keys = (
# "auth_events", "auth_events",
# "prev_events", "prev_events",
# "hashes", "hashes",
# "signatures", "signatures",
# "depth", "depth",
# "origin", "origin",
# "prev_state", "prev_state",
) )
for key in drop_keys: for key in drop_keys:
d.pop(key, None) d.pop(key, None)

6
synapse/storage/databases/main/event_federation.py
View File

@ -1005,7 +1005,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas
connected_insertion_event_query, (event_id, limit - len(event_results)) connected_insertion_event_query, (event_id, limit - len(event_results))
) )
connected_insertion_event_id_results = txn.fetchall() connected_insertion_event_id_results = txn.fetchall()
logger.info( logger.debug(
"_get_backfill_events: connected_insertion_event_query %s", "_get_backfill_events: connected_insertion_event_query %s",
connected_insertion_event_id_results, connected_insertion_event_id_results,
) )
@ -1020,7 +1020,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas
(connected_insertion_event, limit - len(event_results)), (connected_insertion_event, limit - len(event_results)),
) )
chunk_start_event_id_results = txn.fetchall() chunk_start_event_id_results = txn.fetchall()
logger.info( logger.debug(
"_get_backfill_events: chunk_start_event_id_results %s", "_get_backfill_events: chunk_start_event_id_results %s",
chunk_start_event_id_results, chunk_start_event_id_results,
) )
@ -1030,7 +1030,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas
txn.execute(query, (event_id, False, limit - len(event_results))) txn.execute(query, (event_id, False, limit - len(event_results)))
prev_event_id_results = txn.fetchall() prev_event_id_results = txn.fetchall()
logger.info( logger.debug(
"_get_backfill_events: prev_event_ids %s", prev_event_id_results "_get_backfill_events: prev_event_ids %s", prev_event_id_results
) )

4
synapse/storage/databases/main/events.py
View File

@ -1777,7 +1777,7 @@ class PersistEventsStore:
# Invalid insertion event without next chunk ID # Invalid insertion event without next chunk ID
return return
logger.info( logger.debug(
"_handle_insertion_event (next_chunk_id=%s) %s", next_chunk_id, event "_handle_insertion_event (next_chunk_id=%s) %s", next_chunk_id, event
) )
@ -1818,7 +1818,7 @@ class PersistEventsStore:
# No chunk connection to persist # No chunk connection to persist
return return
logger.info("_handle_chunk_id %s %s", chunk_id, event) logger.debug("_handle_chunk_id %s %s", chunk_id, event)
# Keep track of the insertion event and the chunk ID # Keep track of the insertion event and the chunk ID
self.db_pool.simple_insert_txn( self.db_pool.simple_insert_txn(