aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2022-01-31 12:01:53 +0000
committerNeil Alexander <neilalexander@users.noreply.github.com>2022-01-31 12:01:53 +0000
commitf9547a53d2c378cf08b9a8296d2d727c11f535ba (patch)
treef68bb40e1fc7a9f8ad6f3d44031dbeb22ab5743e
parentdac762d025acc333f6f08eb494ae4386d1144b96 (diff)
Tweak roomserver logging for rejected events
-rw-r--r--roomserver/internal/input/input_events.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go
index 2dc09667..f4216805 100644
--- a/roomserver/internal/input/input_events.go
+++ b/roomserver/internal/input/input_events.go
@@ -157,7 +157,7 @@ func (r *Inputer) processRoomEvent(
var rejectionErr error
if rejectionErr = gomatrixserverlib.Allowed(event, &authEvents); rejectionErr != nil {
isRejected = true
- logger.WithError(rejectionErr).Warnf("Event %s rejected", event.EventID())
+ logger.WithError(rejectionErr).Warnf("Event %s not allowed by auth events", event.EventID())
}
// Accumulate the auth event NIDs.
@@ -176,7 +176,7 @@ func (r *Inputer) processRoomEvent(
// current room state.
softfail, err = helpers.CheckForSoftFail(ctx, r.DB, headered, input.StateEventIDs)
if err != nil {
- logger.WithError(err).Info("Error authing soft-failed event")
+ logger.WithError(err).Warn("Error authing soft-failed event")
}
}
@@ -266,7 +266,10 @@ func (r *Inputer) processRoomEvent(
// We stop here if the event is rejected: We've stored it but won't update forward extremities or notify anyone about it.
if isRejected || softfail {
- logger.WithError(rejectionErr).WithField("soft_fail", softfail).Debug("Stored rejected event")
+ logger.WithError(rejectionErr).WithFields(logrus.Fields{
+ "soft_fail": softfail,
+ "missing_prev": missingPrev,
+ }).Warn("Stored rejected event")
return rejectionErr
}