mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-10 15:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make Sytest happy again, clarify logging values

Browse source
This commit is contained in:
Till Faelligen 2023-07-11 13:43:52 +02:00
parent a0070867cb
commit 838c472e3b
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
syncapi/routing/messages.go
View file

@ -259,12 +259,12 @@ func OnIncomingMessagesRequest(
} }
util.GetLogger(req.Context()).WithFields(logrus.Fields{ util.GetLogger(req.Context()).WithFields(logrus.Fields{
"from": from.String(), "request_from": from.String(),
"to": to.String(), "request_to": to.String(),
"limit": filter.Limit, "limit": filter.Limit,
"backwards": backwardOrdering, "backwards": backwardOrdering,
"return_start": start.String(), "response_start": start.String(),
"return_end": end.String(), "response_end": end.String(),
}).Info("Responding") }).Info("Responding")
res := messagesResp{ res := messagesResp{
@ -484,12 +484,6 @@ func (r *messagesReq) handleEmptyEventsSlice() (
func (r *messagesReq) handleNonEmptyEventsSlice(streamEvents []types.StreamEvent) ( func (r *messagesReq) handleNonEmptyEventsSlice(streamEvents []types.StreamEvent) (
events []*rstypes.HeaderedEvent, err error, events []*rstypes.HeaderedEvent, err error,
) { ) {
// We've reached the beginning of the room, nothing more to do.
if r.backwardOrdering && streamEvents[len(streamEvents)-1].Type() == spec.MRoomCreate && streamEvents[len(streamEvents)-1].StateKeyEquals("") {
events = append(events, r.snapshot.StreamEventsToEvents(r.ctx, nil, streamEvents, r.rsAPI)...)
sort.Sort(eventsByDepth(events))
return events, nil
}
// Check if we have enough events. // Check if we have enough events.
isSetLargeEnough := len(streamEvents) >= r.filter.Limit isSetLargeEnough := len(streamEvents) >= r.filter.Limit
if !isSetLargeEnough { if !isSetLargeEnough {