mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 13:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove logging

Browse source
This commit is contained in:
Kegan Dougal 2020-07-08 15:44:28 +01:00
parent 2dc0fca942
commit 20a417715d
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/eventutil/events.go
View file

@ -22,7 +22,6 @@ import (
"github.com/matrix-org/dendrite/internal/config" "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
"github.com/sirupsen/logrus"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
) )
@ -158,7 +157,6 @@ func RedactEvent(redactionEvent, redactedEvent *gomatrixserverlib.Event) (*gomat
if redactionEvent.Type() != gomatrixserverlib.MRoomRedaction { if redactionEvent.Type() != gomatrixserverlib.MRoomRedaction {
return nil, fmt.Errorf("RedactEvent: redactionEvent isn't a redaction event, is '%s'", redactionEvent.Type()) 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() r := redactedEvent.Redact()
err := r.SetUnsignedField("redacted_because", redactionEvent) err := r.SetUnsignedField("redacted_because", redactionEvent)
if err != nil { if err != nil {

5
syncapi/storage/postgres/output_room_events_table.go
View file

@ -29,7 +29,6 @@ import (
"github.com/lib/pq" "github.com/lib/pq"
"github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@ -165,9 +164,7 @@ func (s *outputRoomEventsStatements) UpdateEventJSON(ctx context.Context, event
if err != nil { if err != nil {
return err return err
} }
rr, err := s.updateEventJSONStmt.ExecContext(ctx, headeredJSON, event.EventID()) _, err = s.updateEventJSONStmt.ExecContext(ctx, headeredJSON, event.EventID())
mod, _ := rr.RowsAffected()
logrus.Infof("UpdateEventJSON modified=%d json=%s", mod, string(headeredJSON))
return err return err
} }

5
syncapi/storage/shared/syncserver.go
View file

@ -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") logrus.WithField("event_id", redactedEventID).WithField("redaction_event", redactedBecause.EventID()).Warnf("missing redacted event for redaction")
return nil return nil
} }
logrus.Infof("redaction-ver:%v event-ver:%v", redactedBecause.RoomVersion, redactedEvents[0].RoomVersion)
eventToRedact := redactedEvents[0].Unwrap() eventToRedact := redactedEvents[0].Unwrap()
redactionEvent := redactedBecause.Unwrap() redactionEvent := redactedBecause.Unwrap()
ev, err := eventutil.RedactEvent(&redactionEvent, &eventToRedact) ev, err := eventutil.RedactEvent(&redactionEvent, &eventToRedact)
if err != nil { if err != nil {
logrus.Infof("REDACTME RedactEvent returned an error: %s", err)
return err return err
} }
@ -642,7 +640,6 @@ func (d *Database) getResponseWithPDUsForCompleteSync(
} }
var succeeded bool var succeeded bool
defer func() { defer func() {
logrus.Infof("getResponseWithPDUsForCompleteSync: limit:%d rooms:%v", numRecentEventsPerRoom, joinedRoomIDs)
txerr := sqlutil.EndTransaction(txn, &succeeded) txerr := sqlutil.EndTransaction(txn, &succeeded)
if err == nil && txerr != nil { if err == nil && txerr != nil {
err = txerr err = txerr
@ -814,7 +811,6 @@ func (d *Database) addRoomDeltaToResponse(
// This is all "okay" assuming history_visibility == "shared" which it is by default. // This is all "okay" assuming history_visibility == "shared" which it is by default.
r.To = delta.membershipPos r.To = delta.membershipPos
} }
logrus.Infof("addRoomDeltaToResponse range:%+v roomID:%s limit:%d", r, delta.roomID, numRecentEventsPerRoom)
recentStreamEvents, limited, err := d.OutputEvents.SelectRecentEvents( recentStreamEvents, limited, err := d.OutputEvents.SelectRecentEvents(
ctx, txn, delta.roomID, r, ctx, txn, delta.roomID, r,
numRecentEventsPerRoom, true, true, numRecentEventsPerRoom, true, true,
@ -822,7 +818,6 @@ func (d *Database) addRoomDeltaToResponse(
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("addRoomDeltaToResponse produced %d events, limited:%v", len(recentStreamEvents), limited)
recentEvents := d.StreamEventsToEvents(device, recentStreamEvents) recentEvents := d.StreamEventsToEvents(device, recentStreamEvents)
delta.stateEvents = removeDuplicates(delta.stateEvents, recentEvents) // roll back delta.stateEvents = removeDuplicates(delta.stateEvents, recentEvents) // roll back
prevBatch, err := d.getBackwardTopologyPos(ctx, txn, recentStreamEvents) prevBatch, err := d.getBackwardTopologyPos(ctx, txn, recentStreamEvents)