Skip to content

Commit

Permalink
Include cancelled context error if present.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Martin committed Jul 3, 2024
1 parent ea5ed62 commit 9d3dfc2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rpc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ func (h *BigCallTestServerHandler) Ch(ctx context.Context) (<-chan int, error) {
func TestBigResult(t *testing.T) {
if os.Getenv("I_HAVE_A_LOT_OF_MEMORY_AND_TIME") != "1" {
// needs ~40GB of memory and ~4 minutes to run
t.Skip("skipping test due to requiced resources, set I_HAVE_A_LOT_OF_MEMORY_AND_TIME=1 to run")
t.Skip("skipping test due to required resources, set I_HAVE_A_LOT_OF_MEMORY_AND_TIME=1 to run")
}

// setup server
Expand Down
2 changes: 1 addition & 1 deletion websocket.go
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ func (c *wsConn) handleWsConn(ctx context.Context) {
return // failed to reconnect
}
case <-ctx.Done():
log.Debugw("context cancelled", "lastAction", action, "time", time.Since(start))
log.Debugw("context cancelled", "error", ctx.Err(), "lastAction", action, "time", time.Since(start))
return
case req := <-c.requests:
action = fmt.Sprintf("send-request(%s,%v)", req.req.Method, req.req.ID)
Expand Down

0 comments on commit 9d3dfc2

Please sign in to comment.