Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always set signature RoutingKey to SQS Queue #19

Merged
merged 1 commit into from
Jul 22, 2022
+11 −2
Merged

Always set signature RoutingKey to SQS Queue #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions v1/brokers/sqs/sqs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,10 @@ func (b *Broker) consumeOne(delivery *awssqs.ReceiveMessageOutput, taskProcessor
return fmt.Errorf("task %s is not registered", sig.Name)
}

// Always set the routing key based on the processor. This ensures it's set to the queue it's pulled off of, even
// if the message was originally on another queue (it can be moved automatically to a DLQ).
sig.RoutingKey = b.getQueueName(taskProcessor)

err := taskProcessor.Process(sig, b.extend)
if err != nil {
// stop task deletion in case we want to send messages to dlq in sqs or retry from visibility timeout
Expand Down Expand Up @@ -444,10 +448,15 @@ func (b *Broker) stopReceiving() {
// getQueueURL is a method returns that returns queueURL first by checking if custom queue was set and usign it
// otherwise using default queueName from config
func (b *Broker) getQueueURL(taskProcessor iface.TaskProcessor) *string {
queueName := b.getQueueName(taskProcessor)

return aws.String(b.GetConfig().Broker + "/" + queueName)
}

func (b *Broker) getQueueName(taskProcessor iface.TaskProcessor) string {
queueName := b.GetConfig().DefaultQueue
if taskProcessor.CustomQueue() != "" {
queueName = taskProcessor.CustomQueue()
}

return aws.String(b.GetConfig().Broker + "/" + queueName)
return queueName
}