From 51a929e332bfbfc05685d6d7647f90c4174a4758 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 20 Apr 2022 15:32:37 +0100 Subject: [PATCH] Return some more usefully wrapped errors when doing sync --- syncapi/streams/stream_pdu.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/syncapi/streams/stream_pdu.go b/syncapi/streams/stream_pdu.go index ddc2f55c2..eb348f5ad 100644 --- a/syncapi/streams/stream_pdu.go +++ b/syncapi/streams/stream_pdu.go @@ -3,6 +3,7 @@ package streams import ( "context" "database/sql" + "fmt" "sync" "time" @@ -228,13 +229,13 @@ func (p *PDUStreamProvider) addRoomDeltaToResponse( eventFilter, true, true, ) if err != nil { - return r.From, err + return r.From, fmt.Errorf("p.DB.RecentEvents: %w", err) } recentEvents := p.DB.StreamEventsToEvents(device, recentStreamEvents) delta.StateEvents = removeDuplicates(delta.StateEvents, recentEvents) // roll back prevBatch, err := p.DB.GetBackwardTopologyPos(ctx, recentStreamEvents) if err != nil { - return r.From, err + return r.From, fmt.Errorf("p.DB.GetBackwardTopologyPos: %w", err) } // If we didn't return any events at all then don't bother doing anything else. @@ -276,7 +277,7 @@ func (p *PDUStreamProvider) addRoomDeltaToResponse( device, recentEvents, delta.StateEvents, ) if err != nil { - return r.From, err + return r.From, fmt.Errorf("p.lazyLoadMembers: %w", err) } }