Fix timeout for webhook http request

NdoleStudio · Oct 9, 2023 · f861ee1 · f861ee1
1 parent c81ed85
commit f861ee1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/api/pkg/services/webhook_service.go b/api/pkg/services/webhook_service.go
@@ -196,9 +196,12 @@ func (service *WebhookService) sendNotification(ctx context.Context, event cloud
 	ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)
 	defer span.End()
 
+	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+	defer cancel()
+
 	request, err := service.createRequest(ctx, event, webhook)
 	if err != nil {
-		msg := fmt.Sprintf("cannot send [%s] event to webhook [%s] for user [%s]", event.Type(), webhook.URL, webhook.UserID)
+		msg := fmt.Sprintf("cannot create [%s] event to webhook [%s] for user [%s]", event.Type(), webhook.URL, webhook.UserID)
 		ctxLogger.Error(service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg)))
 		return
 	}
@@ -230,9 +233,6 @@ func (service *WebhookService) createRequest(ctx context.Context, event cloudeve
 	ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)
 	defer span.End()
 
-	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-	defer cancel()
-
 	payload, err := json.Marshal(service.getPayload(ctxLogger, event, webhook))
 	if err != nil {
 		msg := fmt.Sprintf("cannot marshal payload for user [%s] and webhook [%s] for event [%s]", webhook.UserID, webhook.ID, event.ID())