symfony · Jeroeny · Nov 26, 2021 · Nov 26, 2021 · Nov 26, 2021
diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
@@ -31,6 +31,7 @@
 use Symfony\Component\Messenger\EventListener\StopWorkerOnMemoryLimitListener;
 use Symfony\Component\Messenger\EventListener\StopWorkerOnMessageLimitListener;
 use Symfony\Component\Messenger\EventListener\StopWorkerOnTimeLimitListener;
+use Symfony\Component\Messenger\Exception\InvalidArgumentException;
 use Symfony\Component\Messenger\RoutableMessageBus;
 use Symfony\Component\Messenger\Worker;
 
@@ -79,6 +80,7 @@ protected function configure(): void
                 new InputOption('bus', 'b', InputOption::VALUE_REQUIRED, 'Name of the bus to which received messages should be dispatched (if not passed, bus is determined automatically)'),
                 new InputOption('queues', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Limit receivers to only consume from the specified queues'),
                 new InputOption('no-reset', null, InputOption::VALUE_NONE, 'Do not reset container services after each message'),
+                new InputOption('strategy', null, InputOption::VALUE_REQUIRED, 'The strategy to use to consume from the different receivers: "priority", "ordered" or "random"', 'priority'),
             ])
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command consumes messages and dispatches them to the message bus.
@@ -212,10 +214,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $bus = $input->getOption('bus') ? $this->routableBus->getMessageBus($input->getOption('bus')) : $this->routableBus;
+        $strategies = ['priority', 'ordered', 'random'];
+        if (!\in_array($input->getOption('strategy'), $strategies, true)) {
+            throw new InvalidArgumentException(sprintf('The "%s" strategy does not exist. Available strategies are: "%s".', $input->getOption('strategy'), implode('", "', $strategies)));
+        }
 
         $worker = new Worker($receivers, $bus, $this->eventDispatcher, $this->logger);
         $options = [
             'sleep' => $input->getOption('sleep') * 1000000,
+            'strategy' => $input->getOption('strategy'),
         ];
         if ($queues = $input->getOption('queues')) {
             $options['queues'] = $queues;

diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
@@ -38,6 +38,10 @@
  */
 class Worker
 {
+    private const STRATEGY_PRIORITY = 'priority';
+    private const STRATEGY_ORDERED = 'ordered';
+    private const STRATEGY_RANDOM = 'random';
+
     private array $receivers;
     private MessageBusInterface $bus;
     private ?EventDispatcherInterface $eventDispatcher;
@@ -73,6 +77,7 @@ public function run(array $options = []): void
     {
         $options = array_merge([
             'sleep' => 1000000,
+            'strategy' => self::STRATEGY_PRIORITY,
         ], $options);
         $queueNames = $options['queues'] ?? null;
 
@@ -92,6 +97,8 @@ public function run(array $options = []): void
         while (!$this->shouldStop) {
             $envelopeHandled = false;
             $envelopeHandledStart = microtime(true);
+            $receivers = $this->receivers;
+            $receivers = self::STRATEGY_RANDOM === $options['strategy'] ? shuffle($receivers) : $receivers;
             foreach ($this->receivers as $transportName => $receiver) {
                 if ($queueNames) {
                     $envelopes = $receiver->getFromQueues($queueNames);
@@ -113,7 +120,7 @@ public function run(array $options = []): void
                 // after handling a single receiver, quit and start the loop again
                 // this should prevent multiple lower priority receivers from
                 // blocking too long before the higher priority are checked
-                if ($envelopeHandled) {
+                if ($envelopeHandled && self::STRATEGY_PRIORITY === $options['strategy']) {
                     break;
                 }
             }