Merge pull request #722 from alanpoulain/pheanstalk-fix-requeue

makasim · web-flow · commit c221abe97625 · 2019-01-15T14:33:13.000+02:00
[pheanstalk] Requeuing a message should not acknowledge it beforehand
diff --git a/pkg/pheanstalk/PheanstalkConsumer.php b/pkg/pheanstalk/PheanstalkConsumer.php
@@ -88,11 +88,13 @@ public function acknowledge(Message $message): void
      */
     public function reject(Message $message, bool $requeue = false): void
     {
-        $this->acknowledge($message);
-
         if ($requeue) {
             $this->pheanstalk->release($message->getJob(), $message->getPriority(), $message->getDelay());
+
+            return;
         }
+
+        $this->acknowledge($message);
     }
 
     private function convertJobToMessage(Job $job): PheanstalkMessage

Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,13 @@ public function acknowledge(Message $message): void`
`88`	`88`	`*/`
`89`	`89`	`public function reject(Message $message, bool $requeue = false): void`
`90`	`90`	`{`
`91`		`- $this->acknowledge($message);`
`92`		`-`
`93`	`91`	`if ($requeue) {`
`94`	`92`	`$this->pheanstalk->release($message->getJob(), $message->getPriority(), $message->getDelay());`
	`93`	`+`
	`94`	`+ return;`
`95`	`95`	`}`
	`96`	`+`
	`97`	`+ $this->acknowledge($message);`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`private function convertJobToMessage(Job $job): PheanstalkMessage`