[Messenger] Fix exiting FailedMessagesRetryCommand

HypeMC · HypeMC · commit e5ddf863dad5 · 2023-06-27T04:41:25.000+02:00
diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
@@ -19,9 +19,11 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\SignalRegistry\SignalRegistry;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Messenger\Event\WorkerMessageReceivedEvent;
+use Symfony\Component\Messenger\Event\WorkerStartedEvent;
 use Symfony\Component\Messenger\EventListener\StopWorkerOnMessageLimitListener;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Stamp\MessageDecodingFailedStamp;
@@ -165,6 +167,16 @@ private function runInteractive(string $failureTransportName, SymfonyStyle $io,
 
     private function runWorker(string $failureTransportName, ReceiverInterface $receiver, SymfonyStyle $io, bool $shouldForce): int
     {
+        $this->eventDispatcher->addListener(WorkerStartedEvent::class, $signalsListener = function () {
+            if (!\defined('SIGINT') || !SignalRegistry::isSupported()) {
+                return;
+            }
+
+            foreach ([\SIGINT, \SIGTERM] as $signal) {
+                pcntl_signal($signal, $this->getApplication()->getSignalRegistry()->handle(...));
+            }
+        });
+
         $count = 0;
         $listener = function (WorkerMessageReceivedEvent $messageReceivedEvent) use ($io, $receiver, $shouldForce, &$count) {
             ++$count;
@@ -197,6 +209,7 @@ private function runWorker(string $failureTransportName, ReceiverInterface $rece
         try {
             $worker->run();
         } finally {
+            $this->eventDispatcher->removeListener(WorkerStartedEvent::class, $signalsListener);
             $this->eventDispatcher->removeListener(WorkerMessageReceivedEvent::class, $listener);
         }
 
diff --git a/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRetryCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRetryCommandTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Messenger\Tests\Command;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\ServiceLocator;
@@ -60,6 +61,7 @@ public function testBasicRunWithServiceLocator()
             $bus,
             $dispatcher
         );
+        (new Application())->add($command);
 
         $tester = new CommandTester($command);
         $tester->execute(['id' => [10, 12], '--force' => true]);
@@ -138,6 +140,7 @@ public function testBasicRunWithServiceLocatorWithSpecificFailureTransport()
             $bus,
             $dispatcher
         );
+        (new Application())->add($command);
 
         $tester = new CommandTester($command);
         $tester->execute(['id' => [10, 12], '--transport' => $failureTransportName, '--force' => true]);
