Do not stack retry stamp

jderusse · jderusse · commit cbbab2eeb81e · 2020-05-13T19:00:08.000+02:00
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
@@ -67,7 +67,7 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)
             }
 
             // add the delay and retry stamp info
-            $retryEnvelope = $envelope->with(new DelayStamp($delay), new RedeliveryStamp($retryCount));
+            $retryEnvelope = $envelope->withoutAll(DelayStamp::class)->withoutAll(RedeliveryStamp::class)->with(new DelayStamp($delay), new RedeliveryStamp($retryCount));
 
             // re-send the message for retry
             $this->getSenderForTransport($event->getReceiverName())->send($retryEnvelope);

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// add the delay and retry stamp info`
`70`		`- $retryEnvelope = $envelope->with(new DelayStamp($delay), new RedeliveryStamp($retryCount));`
	`70`	`+ $retryEnvelope = $envelope->withoutAll(DelayStamp::class)->withoutAll(RedeliveryStamp::class)->with(new DelayStamp($delay), new RedeliveryStamp($retryCount));`
`71`	`71`
`72`	`72`	`// re-send the message for retry`
`73`	`73`	`$this->getSenderForTransport($event->getReceiverName())->send($retryEnvelope);`