From 517e4b841106131a342f06cafd8e10be0f348361 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 27 Jan 2022 17:28:16 +0000 Subject: [PATCH] Debug logging --- federationapi/internal/federationclient.go | 2 ++ setup/mscs/msc2836/msc2836.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/federationapi/internal/federationclient.go b/federationapi/internal/federationclient.go index b31db466..0ab10546 100644 --- a/federationapi/internal/federationclient.go +++ b/federationapi/internal/federationclient.go @@ -5,6 +5,7 @@ import ( "time" "github.com/matrix-org/gomatrixserverlib" + "github.com/sirupsen/logrus" ) // Functions here are "proxying" calls to the gomatrixserverlib federation @@ -157,6 +158,7 @@ func (a *FederationInternalAPI) MSC2836EventRelationships( ctx, cancel := context.WithTimeout(ctx, time.Minute) defer cancel() ires, err := a.doRequestIfNotBlacklisted(s, func() (interface{}, error) { + logrus.Infof("FederationInternalAPI calling MSC2836EventRelationships on %s", s) return a.federation.MSC2836EventRelationships(ctx, s, r, roomVersion) }) if err != nil { diff --git a/setup/mscs/msc2836/msc2836.go b/setup/mscs/msc2836/msc2836.go index 8a35e414..706fd1fb 100644 --- a/setup/mscs/msc2836/msc2836.go +++ b/setup/mscs/msc2836/msc2836.go @@ -36,6 +36,7 @@ import ( userapi "github.com/matrix-org/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" + "github.com/sirupsen/logrus" ) const ( @@ -342,6 +343,7 @@ func (rc *reqCtx) fetchUnknownEvent(eventID, roomID string) *gomatrixserverlib.H logger.WithError(err).Error("failed to QueryJoinedHostServerNamesInRoom") return nil } + logger.Infof("::DEBUG:: QueryJoinedHostServerNamesInRoom %v", queryRes.ServerNames) // query up to 5 servers serversToQuery := queryRes.ServerNames if len(serversToQuery) > 5 { @@ -477,6 +479,7 @@ func (rc *reqCtx) MSC2836EventRelationships(eventID string, srv gomatrixserverli MaxDepth: rc.req.MaxDepth, RecentFirst: rc.req.RecentFirst, }, ver) + logrus.Infof("::DEBUG:: fedinternal calling MSC2836EventRelationships %+v err=%v", res, err) if err != nil { util.GetLogger(rc.ctx).WithError(err).Error("Failed to call MSC2836EventRelationships") return nil, err