post merge fix

Author: m110

pkg/googlecloud/publisher.go

@@ -165,7 +165,7 @@ func (p *Publisher) Publish(topic string, messages ...*message.Message) error {
 	}
 
 	for _, msg := range messages {
-		err = p.publishMessage(t, msg, topic, deadline)
+		err = p.publishMessage(pub, msg, topic, deadline)
 		if err != nil {
 			return err
 		}
@@ -174,7 +174,7 @@ func (p *Publisher) Publish(topic string, messages ...*message.Message) error {
 	return nil
 }
 
-func (p *Publisher) publishMessage(t *pubsub.Topic, msg *message.Message, topic string, deadline time.Time) error {
+func (p *Publisher) publishMessage(pub *pubsub.Publisher, msg *message.Message, topic string, deadline time.Time) error {
 	ctx, cancel := context.WithDeadline(msg.Context(), deadline)
 	defer cancel()
 
@@ -189,12 +189,12 @@ func (p *Publisher) publishMessage(t *pubsub.Topic, msg *message.Message, topic
 		return errors.Wrapf(err, "cannot marshal message %s", msg.UUID)
 	}
 
-	result := t.Publish(ctx, googlecloudMsg)
+	result := pub.Publish(ctx, googlecloudMsg)
 
 	serverMessageID, err := result.Get(ctx)
 	if err != nil {
 		if p.config.EnableMessageOrdering && p.config.EnableMessageOrderingAutoResumePublishOnError && googlecloudMsg.OrderingKey != "" {
-			t.ResumePublish(googlecloudMsg.OrderingKey)
+			pub.ResumePublish(googlecloudMsg.OrderingKey)
 		}
 		return errors.Wrapf(err, "publishing message %s failed", msg.UUID)
 	}