Merge pull request php-enqueue#1165 from SimplyCodedSoftware/hotfix/atleast-one-delivery

makasim · web-flow · commit 5668b30cad70 · 2021-04-28T20:38:10.000+03:00
Perform at least once delivery when rejecting with requeue
diff --git a/pkg/dbal/DbalConsumer.php b/pkg/dbal/DbalConsumer.php
@@ -100,14 +100,14 @@ public function reject(Message $message, bool $requeue = false): void
     {
         InvalidMessageException::assertMessageInstanceOf($message, DbalMessage::class);
 
-        $this->acknowledge($message);
-
         if ($requeue) {
             $message = clone $message;
             $message->setRedelivered(false);
 
             $this->getContext()->createProducer()->send($this->queue, $message);
         }
+
+        $this->acknowledge($message);
     }
 
     protected function getContext(): DbalContext

Original file line number	Diff line number	Diff line change
`@@ -100,14 +100,14 @@ public function reject(Message $message, bool $requeue = false): void`
`100`	`100`	`{`
`101`	`101`	`InvalidMessageException::assertMessageInstanceOf($message, DbalMessage::class);`
`102`	`102`
`103`		`- $this->acknowledge($message);`
`104`		`-`
`105`	`103`	`if ($requeue) {`
`106`	`104`	`$message = clone $message;`
`107`	`105`	`$message->setRedelivered(false);`
`108`	`106`
`109`	`107`	`$this->getContext()->createProducer()->send($this->queue, $message);`
`110`	`108`	`}`
	`109`	`+`
	`110`	`+ $this->acknowledge($message);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`protected function getContext(): DbalContext`