gopkg/pgx
2
0
Fork 0
Code Activity

Always double-wrap contextAlreadyDoneError

Browse Source 
Signed-off-by: Michael Darr <michael.e.darr@gmail.com>
This commit is contained in:
Michael Darr
2021-07-06 15:43:26 -04:00
committed by Jack Christensen
parent b3e64d3cdb
commit 9a9830c00d
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
errors.go
+2 -8
View File
@@ -163,15 +163,9 @@ func (e *contextAlreadyDoneError) Unwrap() error {
return e.err return e.err
} }
// newContextAlreadyDoneError wraps a context error in `contextAlreadyDoneError`. If the context was cancelled or its // newContextAlreadyDoneError double-wraps a context error in `contextAlreadyDoneError` and `ErrTimeout`.
// deadline passed, the returned error is also wrapped by `ErrTimeout`.
func newContextAlreadyDoneError(ctx context.Context) (err error) { func newContextAlreadyDoneError(ctx context.Context) (err error) {
ctxErr := ctx.Err() return &ErrTimeout{&contextAlreadyDoneError{err: ctx.Err()}}
err = &contextAlreadyDoneError{err: ctxErr}
if ctxErr != nil {
err = &ErrTimeout{err: err}
}
return err
} }
type writeError struct { type writeError struct {