mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-25 07:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Logging tweaks

Browse source
This commit is contained in:
Neil Alexander 2020-09-29 09:47:41 +01:00
parent 5e6afdce1a
commit 4bcdb8fa0c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
federationapi/routing/send.go
View file

@ -345,6 +345,8 @@ func (t *txnReq) processDeviceListUpdate(ctx context.Context, e gomatrixserverli
} }
func (t *txnReq) processEvent(ctx context.Context, e gomatrixserverlib.Event, isInboundTxn bool) error { func (t *txnReq) processEvent(ctx context.Context, e gomatrixserverlib.Event, isInboundTxn bool) error {
logger := util.GetLogger(ctx).WithField("event_id", e.EventID()).WithField("room_id", e.RoomID())
// Work out if the roomserver knows everything it needs to know to auth // Work out if the roomserver knows everything it needs to know to auth
// the event. // the event.
stateReq := api.QueryMissingAuthPrevEventsRequest{ stateReq := api.QueryMissingAuthPrevEventsRequest{
@ -367,7 +369,6 @@ func (t *txnReq) processEvent(ctx context.Context, e gomatrixserverlib.Event, is
return roomNotFoundError{e.RoomID()} return roomNotFoundError{e.RoomID()}
} }
// TODO: Make this less bad
if len(stateResp.MissingAuthEventIDs) > 0 { if len(stateResp.MissingAuthEventIDs) > 0 {
servers := []gomatrixserverlib.ServerName{t.Origin} servers := []gomatrixserverlib.ServerName{t.Origin}
serverReq := &api.QueryServerJoinedToRoomRequest{ serverReq := &api.QueryServerJoinedToRoomRequest{
@ -376,26 +377,26 @@ func (t *txnReq) processEvent(ctx context.Context, e gomatrixserverlib.Event, is
serverRes := &api.QueryServerJoinedToRoomResponse{} serverRes := &api.QueryServerJoinedToRoomResponse{}
if err := t.rsAPI.QueryServerJoinedToRoom(ctx, serverReq, serverRes); err == nil { if err := t.rsAPI.QueryServerJoinedToRoom(ctx, serverReq, serverRes); err == nil {
servers = append(servers, serverRes.ServerNames...) servers = append(servers, serverRes.ServerNames...)
logrus.WithContext(ctx).Infof("Found %d server(s) to query for missing events", len(servers)) logger.Infof("Found %d server(s) to query for missing events", len(servers))
} }
getAuthEvent: getAuthEvent:
for _, missingAuthEventID := range stateResp.MissingAuthEventIDs { for _, missingAuthEventID := range stateResp.MissingAuthEventIDs {
for _, server := range servers { for _, server := range servers {
logrus.WithContext(ctx).Infof("Retrieving missing auth event %q from %q", missingAuthEventID, server) logger.Infof("Retrieving missing auth event %q from %q", missingAuthEventID, server)
tx, err := t.federation.GetEvent(ctx, server, missingAuthEventID) tx, err := t.federation.GetEvent(ctx, server, missingAuthEventID)
if err != nil { if err != nil {
continue continue // try the next server
} }
ev, err := gomatrixserverlib.NewEventFromUntrustedJSON(tx.PDUs[0], stateResp.RoomVersion) ev, err := gomatrixserverlib.NewEventFromUntrustedJSON(tx.PDUs[0], stateResp.RoomVersion)
if err != nil { if err != nil {
logrus.WithContext(ctx).WithError(err).Warnf("Failed to unmarshal auth event %q", missingAuthEventID) logger.WithError(err).Errorf("Failed to unmarshal auth event %q", missingAuthEventID)
continue getAuthEvent continue // try the next server
} }
if err = t.processEvent(ctx, ev, false); err != nil { if err = t.processEvent(ctx, ev, false); err != nil {
logrus.WithContext(ctx).WithError(err).Warnf("Failed to process auth event %q", missingAuthEventID) logger.WithError(err).Errorf("Failed to process auth event %q", missingAuthEventID)
} }
continue getAuthEvent continue getAuthEvent // move onto the next event
} }
} }
} }