Skip to content

fix: making the delete queue url from task signature. #840

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

Open
Vishwajeet878 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: making the delete queue url from task signature. #840

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
18 changes: 12 additions & 6 deletions v1/brokers/sqs/sqs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,15 @@ func (b *Broker) consumeOne(delivery *awssqs.ReceiveMessageOutput, taskProcessor
return errors.New("received empty message, the delivery is " + delivery.GoString())
}

qURL := b.defaultQueueURL()

sig := new(tasks.Signature)
decoder := json.NewDecoder(strings.NewReader(*delivery.Messages[0].Body))
decoder.UseNumber()
if err := decoder.Decode(sig); err != nil {
log.ERROR.Printf("unmarshal error. the delivery is %v", delivery)
// if the unmarshal fails, remove the delivery from the queue
if delErr := b.deleteOne(delivery); delErr != nil {
if delErr := b.deleteOne(delivery, qURL); delErr != nil {
log.ERROR.Printf("error when deleting the delivery. delivery is %v, Error=%s", delivery, delErr)
}
return err
Expand All @@ -215,11 +217,16 @@ func (b *Broker) consumeOne(delivery *awssqs.ReceiveMessageOutput, taskProcessor
sig.SQSReceiptHandle = *delivery.Messages[0].ReceiptHandle
}

if sig.RoutingKey != "" {
routingKeyQueueUrl := b.GetConfig().Broker + "/" + sig.RoutingKey
qURL = &routingKeyQueueUrl
}

// If the task is not registered return an error
// and leave the message in the queue
if !b.IsTaskRegistered(sig.Name) {
if sig.IgnoreWhenTaskNotRegistered {
b.deleteOne(delivery)
b.deleteOne(delivery, qURL)
}
return fmt.Errorf("task %s is not registered", sig.Name)
}
Expand All @@ -233,17 +240,16 @@ func (b *Broker) consumeOne(delivery *awssqs.ReceiveMessageOutput, taskProcessor
return err
}
// Delete message after successfully consuming and processing the message
if err = b.deleteOne(delivery); err != nil {
if err = b.deleteOne(delivery, qURL); err != nil {
log.ERROR.Printf("error when deleting the delivery. delivery is %v, Error=%s", delivery, err)
}
return err
}

// deleteOne is a method delete a delivery from AWS SQS
func (b *Broker) deleteOne(delivery *awssqs.ReceiveMessageOutput) error {
qURL := b.defaultQueueURL()
func (b *Broker) deleteOne(delivery *awssqs.ReceiveMessageOutput, queueUrl *string) error {
_, err := b.service.DeleteMessage(&awssqs.DeleteMessageInput{
QueueUrl: qURL,
QueueUrl: queueUrl,
ReceiptHandle: delivery.Messages[0].ReceiptHandle,
})

Expand Down