Skip to content

Commit

Permalink
report err from OnClose and close connection regardless of the error
Browse files Browse the repository at this point in the history
  • Loading branch information
alovak committed May 28, 2024
1 parent 5a6fc9f commit c57c37f
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
2 changes: 1 addition & 1 deletion connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ func (c *Connection) CloseCtx(ctx context.Context) error {

if onClose != nil {
if err := onClose(ctx, c); err != nil {
return fmt.Errorf("on close callback: %w", err)
c.handleError(fmt.Errorf("on close callback: %w", err))
}
}

Expand Down
37 changes: 37 additions & 0 deletions connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,43 @@ func TestClient_Connect(t *testing.T) {
return atomic.LoadInt32(&onClosedCalled) == 1
}, 100*time.Millisecond, 20*time.Millisecond, "onClose should be called")
})

t.Run("when OnCloseCtx returns error, we still close the connection", func(t *testing.T) {
server, err := NewTestServer()
require.NoError(t, err)
defer server.Close()

var onClosedCalled int32
onCloseCtx := func(ctx context.Context, c *connection.Connection) error {
// increase the counter
atomic.AddInt32(&onClosedCalled, 1)
return errors.New("error from on close handler")
}

var onErrCalled int32
errHandler := func(err error) {
atomic.AddInt32(&onErrCalled, 1)
require.Contains(t, err.Error(), "error from on close handler")
}

c, err := connection.New(
server.Addr,
testSpec,
readMessageLength,
writeMessageLength,
connection.ErrorHandler(errHandler),
connection.OnCloseCtx(onCloseCtx),
)
require.NoError(t, err)

err = c.CloseCtx(context.Background())
require.NoError(t, err)

// eventually the onClosedCalled should be 1
require.Eventually(t, func() bool {
return atomic.LoadInt32(&onClosedCalled) == 1
}, 100*time.Millisecond, 20*time.Millisecond, "onClose should be called")
})
}

func TestClient_Write(t *testing.T) {
Expand Down

0 comments on commit c57c37f

Please sign in to comment.