From 2c6e49d99dab7b196e3c53e0ec8051230dc346e9 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Fri, 18 Oct 2024 11:58:05 +0200 Subject: [PATCH] Fix error handling --- commonspace/sync/objectsync/synchandler.go | 8 +++++++- commonspace/sync/requestmanager.go | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/commonspace/sync/objectsync/synchandler.go b/commonspace/sync/objectsync/synchandler.go index 75db17bf..65ddc76c 100644 --- a/commonspace/sync/objectsync/synchandler.go +++ b/commonspace/sync/objectsync/synchandler.go @@ -23,6 +23,7 @@ import ( "github.com/anyproto/any-sync/commonspace/syncstatus" "github.com/anyproto/any-sync/net/peer" "github.com/anyproto/any-sync/net/pool" + "github.com/anyproto/any-sync/net/rpc/rpcerr" "github.com/anyproto/any-sync/net/secureservice" ) @@ -187,7 +188,7 @@ func (o *objectSync) SendStreamRequest(ctx context.Context, rq syncdeps.Request, if err != nil { return err } - return pr.DoDrpc(ctx, func(conn drpc.Conn) error { + err = pr.DoDrpc(ctx, func(conn drpc.Conn) error { cl := spacesyncproto.NewDRPCSpaceSyncClient(conn) res, err := rq.Proto() if err != nil { @@ -203,4 +204,9 @@ func (o *objectSync) SendStreamRequest(ctx context.Context, rq syncdeps.Request, } return receive(stream) }) + if err != nil { + err = rpcerr.Unwrap(err) + return + } + return } diff --git a/commonspace/sync/requestmanager.go b/commonspace/sync/requestmanager.go index 0752ce7d..4c88aab5 100644 --- a/commonspace/sync/requestmanager.go +++ b/commonspace/sync/requestmanager.go @@ -79,7 +79,7 @@ func (r *requestManager) QueueRequest(rq syncdeps.Request) error { r.requestPool.Add(rq.PeerId(), rq.ObjectId(), func(ctx context.Context) { err := r.handler.ApplyRequest(ctx, rq, r) if err != nil { - log.Error("failed to apply request", zap.Error(err), zap.String("peerId", rq.PeerId()), zap.String("objectId", rq.ObjectId())) + log.Debug("failed to apply request", zap.Error(err), zap.String("peerId", rq.PeerId()), zap.String("objectId", rq.ObjectId())) } }, func() { r.metric.UpdateQueueSize(size, syncdeps.MsgTypeOutgoingRequest, false)