From fc0002320633ee8b994aeac2b1cac596151bae2d Mon Sep 17 00:00:00 2001 From: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com> Date: Mon, 19 Dec 2022 22:03:53 +0000 Subject: [PATCH] Small naming fixes Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com> --- pubsub/azure/servicebus/queues/servicebus.go | 6 +++--- pubsub/azure/servicebus/topics/servicebus.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pubsub/azure/servicebus/queues/servicebus.go b/pubsub/azure/servicebus/queues/servicebus.go index f18c06f32..06c01abd2 100644 --- a/pubsub/azure/servicebus/queues/servicebus.go +++ b/pubsub/azure/servicebus/queues/servicebus.go @@ -96,9 +96,9 @@ func (a *azureServiceBus) Publish(ctx context.Context, req *pubsub.PublishReques } // Try sending the message - parentCtx, cancel := context.WithTimeout(ctx, time.Second*time.Duration(a.metadata.TimeoutInSec)) - defer cancel() - err = sender.SendMessage(parentCtx, msg, nil) + publishCtx, publisCancel := context.WithTimeout(ctx, time.Second*time.Duration(a.metadata.TimeoutInSec)) + err = sender.SendMessage(publishCtx, msg, nil) + publisCancel() if err != nil { if impl.IsNetworkError(err) { // Retry after reconnecting diff --git a/pubsub/azure/servicebus/topics/servicebus.go b/pubsub/azure/servicebus/topics/servicebus.go index 2fd522b39..6bc15e6e7 100644 --- a/pubsub/azure/servicebus/topics/servicebus.go +++ b/pubsub/azure/servicebus/topics/servicebus.go @@ -95,9 +95,9 @@ func (a *azureServiceBus) Publish(ctx context.Context, req *pubsub.PublishReques } // Try sending the message - parentCtx, cancel := context.WithTimeout(ctx, time.Second*time.Duration(a.metadata.TimeoutInSec)) - defer cancel() - err = sender.SendMessage(parentCtx, msg, nil) + publishCtx, publishCancel := context.WithTimeout(ctx, time.Second*time.Duration(a.metadata.TimeoutInSec)) + err = sender.SendMessage(publishCtx, msg, nil) + publishCancel() if err != nil { if impl.IsNetworkError(err) { // Retry after reconnecting