Move one messager after the other from list to stream

alexander-schranz · alexander-schranz · commit faeb7f003dc5 · 2019-07-08T23:59:10.000+02:00
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
@@ -38,6 +38,7 @@ class Connection
     private $connection;
     private $stream;
     private $queue;
+    private $tempQueue;
     private $group;
     private $consumer;
     private $autoSetup;
@@ -53,9 +54,10 @@ public function __construct(array $configuration, array $connectionCredentials =
         $this->connection->connect($connectionCredentials['host'] ?? '127.0.0.1', $connectionCredentials['port'] ?? 6379);
         $this->connection->setOption(\Redis::OPT_SERIALIZER, $redisOptions['serializer'] ?? \Redis::SERIALIZER_PHP);
         $this->stream = $configuration['stream'] ?? self::DEFAULT_OPTIONS['stream'];
-        $this->queue = $this->stream.'_queue';
         $this->group = $configuration['group'] ?? self::DEFAULT_OPTIONS['group'];
         $this->consumer = $configuration['consumer'] ?? self::DEFAULT_OPTIONS['consumer'];
+        $this->queue = $this->stream.'__queue';
+        $this->tempQueue = $this->stream.'__queue__'.$this->group.'__'.$this->consumer;
         $this->autoSetup = $configuration['auto_setup'] ?? self::DEFAULT_OPTIONS['auto_setup'];
     }
 
@@ -98,12 +100,14 @@ public function get(): ?array
         $queuedMessageCount = $this->connection->zcount($this->queue, 0, time());
 
         if ($queuedMessageCount) {
-            foreach ($this->connection->zpopmin($this->queue, $queuedMessageCount) as $queuedMessage => $time) {
-                $queuedMessage = json_encode($queuedMessage, true);
-                // if a futured placed message is actually popped because of a race condition with
-                // another running message consumer, the message is readded to the queue by add function
-                // else its just added stream and will be available for all stream consumers
-                $this->add($queuedMessage['body'], $queuedMessage['headers'], (time() - $time) * 1000);
+            for ($i=0;$i<$queuedMessageCount;$i++) {
+                foreach ($this->connection->zpopmin($this->queue, 1) as $queuedMessage => $time) {
+                    $queuedMessage = json_encode($queuedMessage, true);
+                    // if a futured placed message is actually popped because of a race condition with
+                    // another running message consumer, the message is readded to the queue by add function
+                    // else its just added stream and will be available for all stream consumers
+                    $this->add($queuedMessage['body'], $queuedMessage['headers'], (time() - $time) * 1000);
+                }
             }
         }
 
