wrap sbSender calls in their own func

Azure · May 8, 2024 · ec00f0b · ec00f0b
1 parent 0ba6faf
commit ec00f0b
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/v2/sender.go b/v2/sender.go
@@ -82,9 +82,7 @@ func (d *Sender) SendMessage(ctx context.Context, mb MessageBody, options ...fun
 
 	errChan := make(chan error)
 	go func() {
-		d.mu.RLock()
-		err := d.sbSender.SendMessage(ctx, msg, nil) // sendMessageOptions currently does nothing
-		d.mu.RUnlock()
+		err := d.sendMessage(ctx, msg, nil) // sendMessageOptions currently does nothing
 		if err != nil {
 			errChan <- fmt.Errorf("failed to send message: %w", err)
 		} else {
@@ -144,9 +142,7 @@ func (d *Sender) SendMessageBatch(ctx context.Context, messages []*azservicebus.
 		return fmt.Errorf("failed to send message: %w", ctx.Err())
 	}
 
-	d.mu.RLock()
-	batch, err := d.sbSender.NewMessageBatch(ctx, &azservicebus.MessageBatchOptions{})
-	d.mu.RUnlock()
+	batch, err := d.newMessageBatch(ctx, &azservicebus.MessageBatchOptions{})
 	if err != nil {
 		return err
 	}
@@ -164,10 +160,7 @@ func (d *Sender) SendMessageBatch(ctx context.Context, messages []*azservicebus.
 	errChan := make(chan error)
 
 	go func() {
-		d.mu.RLock()
-		err := d.sbSender.SendMessageBatch(ctx, batch, nil)
-		d.mu.RUnlock()
-		if err != nil {
+		if err := d.sendMessageBatch(ctx, batch, nil); err != nil {
 			errChan <- fmt.Errorf("failed to send message batch: %w", err)
 		} else {
 			errChan <- nil
@@ -186,7 +179,24 @@ func (d *Sender) SendMessageBatch(ctx context.Context, messages []*azservicebus.
 		}
 		return err
 	}
+}
+
+func (d *Sender) sendMessage(ctx context.Context, msg *azservicebus.Message, options *azservicebus.SendMessageOptions) error {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+	return d.sbSender.SendMessage(ctx, msg, options)
+}
 
+func (d *Sender) sendMessageBatch(ctx context.Context, batch *azservicebus.MessageBatch, options *azservicebus.SendMessageBatchOptions) error {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+	return d.sbSender.SendMessageBatch(ctx, batch, options)
+}
+
+func (d *Sender) newMessageBatch(ctx context.Context, options *azservicebus.MessageBatchOptions) (*azservicebus.MessageBatch, error) {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+	return d.sbSender.NewMessageBatch(ctx, options)
 }
 
 // AzSender returns the underlying azservicebus.Sender instance.