From a3433a861e1556eac50d62534f3ff8ff3b86e5dc Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 28 Sep 2020 13:17:20 +0100 Subject: [PATCH] More logging --- roomserver/internal/helpers/auth.go | 6 +++--- roomserver/internal/input/input_events.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roomserver/internal/helpers/auth.go b/roomserver/internal/helpers/auth.go index 834bc0c6e..1030775d2 100644 --- a/roomserver/internal/helpers/auth.go +++ b/roomserver/internal/helpers/auth.go @@ -99,7 +99,7 @@ func CheckAuthEvents( // Grab the numeric IDs for the supplied auth state events from the database. authStateEntries, err := db.StateEntriesForEventIDs(ctx, authEventIDs) if err != nil { - return nil, err + return nil, fmt.Errorf("db.StateEntriesForEventIDs: %w", err) } authStateEntries = types.DeduplicateStateEntries(authStateEntries) @@ -109,12 +109,12 @@ func CheckAuthEvents( // Load the actual auth events from the database. authEvents, err := loadAuthEvents(ctx, db, stateNeeded, authStateEntries) if err != nil { - return nil, err + return nil, fmt.Errorf("loadAuthEvents: %w", err) } // Check if the event is allowed. if err = gomatrixserverlib.Allowed(event.Event, &authEvents); err != nil { - return nil, err + return nil, fmt.Errorf("gomatrixserverlib.Allowed: %w", err) } // Return the numeric IDs for the auth events. diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go index f953a9259..3d44f0486 100644 --- a/roomserver/internal/input/input_events.go +++ b/roomserver/internal/input/input_events.go @@ -49,7 +49,7 @@ func (r *Inputer) processRoomEvent( isRejected := false authEventNIDs, rejectionErr := helpers.CheckAuthEvents(ctx, r.DB, headered, input.AuthEventIDs) if rejectionErr != nil { - logrus.WithError(rejectionErr).WithField("event_id", event.EventID()).WithField("auth_event_ids", input.AuthEventIDs).Error("processRoomEvent.checkAuthEvents failed for event, rejecting event") + logrus.WithError(rejectionErr).WithField("event_id", event.EventID()).WithField("auth_event_ids", input.AuthEventIDs).Error("helpers.CheckAuthEvents failed for event, rejecting event") isRejected = true }