[Messenger] Fix graceful exit with ids

HypeMC · HypeMC · commit 1fc56bb48597 · 2023-10-19T07:19:49.000+02:00
diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
@@ -124,7 +124,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $this->retrySpecificIds($failureTransportName, $ids, $io, $shouldForce);
-        $io->success('All done!');
+
+        if (!$this->shouldStop) {
+            $io->success('All done!');
+        }
 
         return 0;
     }
@@ -255,6 +258,10 @@ private function retrySpecificIds(string $failureTransportName, array $ids, Symf
 
             $singleReceiver = new SingleMessageReceiver($receiver, $envelope);
             $this->runWorker($failureTransportName, $singleReceiver, $io, $shouldForce);
+
+            if ($this->shouldStop) {
+                break;
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`$this->retrySpecificIds($failureTransportName, $ids, $io, $shouldForce);`
`127`		`- $io->success('All done!');`
	`127`	`+`
	`128`	`+ if (!$this->shouldStop) {`
	`129`	`+ $io->success('All done!');`
	`130`	`+ }`
`128`	`131`
`129`	`132`	`return 0;`
`130`	`133`	`}`
`@@ -255,6 +258,10 @@ private function retrySpecificIds(string $failureTransportName, array $ids, Symf`
`255`	`258`
`256`	`259`	`$singleReceiver = new SingleMessageReceiver($receiver, $envelope);`
`257`	`260`	`$this->runWorker($failureTransportName, $singleReceiver, $io, $shouldForce);`
	`261`	`+`
	`262`	`+ if ($this->shouldStop) {`
	`263`	`+ break;`
	`264`	`+ }`
`258`	`265`	`}`
`259`	`266`	`}`
`260`	`267`