diff --git a/internal/eventutil/events.go b/internal/eventutil/events.go index a993adf1e..1e3afac8a 100644 --- a/internal/eventutil/events.go +++ b/internal/eventutil/events.go @@ -22,7 +22,6 @@ import ( "github.com/matrix-org/dendrite/internal/config" "github.com/matrix-org/dendrite/roomserver/api" - "github.com/sirupsen/logrus" "github.com/matrix-org/gomatrixserverlib" ) @@ -158,7 +157,6 @@ func RedactEvent(redactionEvent, redactedEvent *gomatrixserverlib.Event) (*gomat if redactionEvent.Type() != gomatrixserverlib.MRoomRedaction { return nil, fmt.Errorf("RedactEvent: redactionEvent isn't a redaction event, is '%s'", redactionEvent.Type()) } - logrus.Infof("IMMA REDACTME NOW! redacted=", redactedEvent.Redacted(), " ver=", redactedEvent.Version()) r := redactedEvent.Redact() err := r.SetUnsignedField("redacted_because", redactionEvent) if err != nil { diff --git a/syncapi/storage/postgres/output_room_events_table.go b/syncapi/storage/postgres/output_room_events_table.go index 646520d1f..5315de243 100644 --- a/syncapi/storage/postgres/output_room_events_table.go +++ b/syncapi/storage/postgres/output_room_events_table.go @@ -29,7 +29,6 @@ import ( "github.com/lib/pq" "github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" - "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" ) @@ -165,9 +164,7 @@ func (s *outputRoomEventsStatements) UpdateEventJSON(ctx context.Context, event if err != nil { return err } - rr, err := s.updateEventJSONStmt.ExecContext(ctx, headeredJSON, event.EventID()) - mod, _ := rr.RowsAffected() - logrus.Infof("UpdateEventJSON modified=%d json=%s", mod, string(headeredJSON)) + _, err = s.updateEventJSONStmt.ExecContext(ctx, headeredJSON, event.EventID()) return err } diff --git a/syncapi/storage/shared/syncserver.go b/syncapi/storage/shared/syncserver.go index 37a2375da..38b503cd0 100644 --- a/syncapi/storage/shared/syncserver.go +++ b/syncapi/storage/shared/syncserver.go @@ -607,12 +607,10 @@ func (d *Database) RedactEvent(ctx context.Context, redactedEventID string, reda logrus.WithField("event_id", redactedEventID).WithField("redaction_event", redactedBecause.EventID()).Warnf("missing redacted event for redaction") return nil } - logrus.Infof("redaction-ver:%v event-ver:%v", redactedBecause.RoomVersion, redactedEvents[0].RoomVersion) eventToRedact := redactedEvents[0].Unwrap() redactionEvent := redactedBecause.Unwrap() ev, err := eventutil.RedactEvent(&redactionEvent, &eventToRedact) if err != nil { - logrus.Infof("REDACTME RedactEvent returned an error: %s", err) return err } @@ -642,7 +640,6 @@ func (d *Database) getResponseWithPDUsForCompleteSync( } var succeeded bool defer func() { - logrus.Infof("getResponseWithPDUsForCompleteSync: limit:%d rooms:%v", numRecentEventsPerRoom, joinedRoomIDs) txerr := sqlutil.EndTransaction(txn, &succeeded) if err == nil && txerr != nil { err = txerr @@ -814,7 +811,6 @@ func (d *Database) addRoomDeltaToResponse( // This is all "okay" assuming history_visibility == "shared" which it is by default. r.To = delta.membershipPos } - logrus.Infof("addRoomDeltaToResponse range:%+v roomID:%s limit:%d", r, delta.roomID, numRecentEventsPerRoom) recentStreamEvents, limited, err := d.OutputEvents.SelectRecentEvents( ctx, txn, delta.roomID, r, numRecentEventsPerRoom, true, true, @@ -822,7 +818,6 @@ func (d *Database) addRoomDeltaToResponse( if err != nil { return err } - logrus.Infof("addRoomDeltaToResponse produced %d events, limited:%v", len(recentStreamEvents), limited) recentEvents := d.StreamEventsToEvents(device, recentStreamEvents) delta.stateEvents = removeDuplicates(delta.stateEvents, recentEvents) // roll back prevBatch, err := d.getBackwardTopologyPos(ctx, txn, recentStreamEvents)