Skip to content

Commit 87d35ed

Browse files
authored
Merge pull request #5 from Interhyp/feature/ACC-7042-handle-context-canceled
fix(ACC-7042): handle error 'context canceled'
2 parents 6112032 + b737bbf commit 87d35ed

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

api/apierrors/handling.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package apierrors
33
import (
44
"context"
55
"encoding/json"
6+
"fmt"
67
"github.com/Interhyp/go-backend-service-common/api"
78
"github.com/Interhyp/go-backend-service-common/web/util/media"
89
aulogging "github.com/StephanHCB/go-autumn-logging"
@@ -31,6 +32,15 @@ func HandleError(ctx context.Context, w http.ResponseWriter, r *http.Request, er
3132
return
3233
}
3334
}
35+
} else if r.Context().Err() == context.Canceled {
36+
w.WriteHeader(http.StatusRequestTimeout)
37+
if err != nil {
38+
detailedMessage := fmt.Sprintf("Request canceled, details: %s", err.Error())
39+
aulogging.Logger.Ctx(r.Context()).Warn().Print(detailedMessage)
40+
} else {
41+
aulogging.Logger.Ctx(r.Context()).Warn().Print("Request canceled")
42+
}
43+
return
3444
}
3545
// ensure 500 if a handler throws a type of error not documented in the OpenAPI spec
3646
unexpectedErrorHandler(ctx, w, r, err)

0 commit comments

Comments
 (0)