Skip to content

Commit 1e0b170

Browse files
committed
Fix timeout context for http requests
1 parent 709db27 commit 1e0b170

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

api/pkg/services/webhook_service.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ func (service *WebhookService) sendNotification(ctx context.Context, event cloud
196196
ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)
197197
defer span.End()
198198

199-
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
199+
requestCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
200200
defer cancel()
201201

202-
request, err := service.createRequest(ctx, event, webhook)
202+
request, err := service.createRequest(requestCtx, event, webhook)
203203
if err != nil {
204204
msg := fmt.Sprintf("cannot create [%s] event to webhook [%s] for user [%s]", event.Type(), webhook.URL, webhook.UserID)
205205
ctxLogger.Error(service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg)))
@@ -334,7 +334,7 @@ func (service *WebhookService) handleWebhookSendFailed(ctx context.Context, even
334334
ErrorMessage: err.Error(),
335335
}
336336

337-
if errors.Is(err, context.Canceled) {
337+
if errors.Is(err, context.DeadlineExceeded) {
338338
payload.ErrorMessage = "TIMOUT after 5 seconds"
339339
}
340340

0 commit comments

Comments
 (0)