From ac525fba47b4a63d4d340d044c2276d4ced21675 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 7 Jan 2021 15:58:48 +0000 Subject: [PATCH] Use limit for incremental sync --- syncapi/streams/stream_pdu.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/syncapi/streams/stream_pdu.go b/syncapi/streams/stream_pdu.go index 84d535b9f..9d293b4b7 100644 --- a/syncapi/streams/stream_pdu.go +++ b/syncapi/streams/stream_pdu.go @@ -97,7 +97,6 @@ func (p *PDUStreamProvider) IncrementalSync( newPos = to var err error - //var events []types.StreamEvent var stateDeltas []types.StateDelta var joinedRooms []string @@ -106,10 +105,12 @@ func (p *PDUStreamProvider) IncrementalSync( if req.WantFullState { if stateDeltas, joinedRooms, err = p.DB.GetStateDeltasForFullStateSync(ctx, req.Device, r, req.Device.UserID, &stateFilter); err != nil { + req.Log.WithError(err).Error("p.DB.GetStateDeltasForFullStateSync failed") return } } else { if stateDeltas, joinedRooms, err = p.DB.GetStateDeltas(ctx, req.Device, r, req.Device.UserID, &stateFilter); err != nil { + req.Log.WithError(err).Error("p.DB.GetStateDeltas failed") return } } @@ -119,9 +120,9 @@ func (p *PDUStreamProvider) IncrementalSync( } for _, delta := range stateDeltas { - err = p.addRoomDeltaToResponse(ctx, req.Device, r, delta, 20, req.Response) - if err != nil { - return newPos // nil, fmt.Errorf("d.addRoomDeltaToResponse: %w", err) + if err = p.addRoomDeltaToResponse(ctx, req.Device, r, delta, req.Limit, req.Response); err != nil { + req.Log.WithError(err).Error("d.addRoomDeltaToResponse failed") + return newPos } }