[Messenger] Make redis Connection::get() non blocking by default

Author: Robin Chalas

Tests/Transport/RedisExt/ConnectionTest.php

@@ -46,9 +46,9 @@ public function testFromDsnWithOptions()
                 'host' => 'localhost',
                 'port' => 6379,
             ], [
-                'blocking_timeout' => 30,
+                'serializer' => 2,
             ]),
-            Connection::fromDsn('redis://localhost/queue/group1/consumer1', ['blocking_timeout' => 30])
+            Connection::fromDsn('redis://localhost/queue/group1/consumer1', ['serializer' => 2])
         );
     }
 
@@ -59,9 +59,9 @@ public function testFromDsnWithQueryOptions()
                 'host' => 'localhost',
                 'port' => 6379,
             ], [
-                'blocking_timeout' => 30,
+                'serializer' => 2,
             ]),
-            Connection::fromDsn('redis://localhost/queue/group1/consumer1?blocking_timeout=30')
+            Connection::fromDsn('redis://localhost/queue/group1/consumer1?serializer=2')
         );
     }
 
@@ -134,16 +134,20 @@ public function testGetAfterReject()
         $redis->del('messenger-rejectthenget');
     }
 
-    public function testBlockingTimeout()
+    public function testGetNonBlocking()
     {
         $redis = new \Redis();
-        $connection = Connection::fromDsn('redis://localhost/messenger-blockingtimeout', ['blocking_timeout' => 1], $redis);
+
+        $connection = Connection::fromDsn('redis://localhost/messenger-getnonblocking', [], $redis);
         try {
             $connection->setup();
         } catch (TransportException $e) {
         }
 
-        $this->assertNull($connection->get());
-        $redis->del('messenger-blockingtimeout');
+        $this->assertNull($connection->get()); // no message, should return null immediately
+        $connection->add('1', []);
+        $this->assertNotEmpty($message = $connection->get());
+        $connection->reject($message['id']);
+        $redis->del('messenger-getnonblocking');
     }
 }

Transport/RedisExt/Connection.php

@@ -31,7 +31,6 @@ class Connection
     private $stream;
     private $group;
     private $consumer;
-    private $blockingTimeout;
     private $couldHavePendingMessages = true;
 
     public function __construct(array $configuration, array $connectionCredentials = [], array $redisOptions = [], \Redis $redis = null)
@@ -42,7 +41,6 @@ public function __construct(array $configuration, array $connectionCredentials =
         $this->stream = $configuration['stream'] ?? '' ?: 'messages';
         $this->group = $configuration['group'] ?? '' ?: 'symfony';
         $this->consumer = $configuration['consumer'] ?? '' ?: 'consumer';
-        $this->blockingTimeout = $redisOptions['blocking_timeout'] ?? null;
     }
 
     public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $redis = null): self
@@ -83,8 +81,7 @@ public function get(): ?array
                 $this->group,
                 $this->consumer,
                 [$this->stream => $messageId],
-                1,
-                $this->blockingTimeout
+                1
             );
         } catch (\RedisException $e) {
         }
@@ -142,7 +139,7 @@ public function reject(string $id): void
         }
     }
 
-    public function add(string $body, array $headers)
+    public function add(string $body, array $headers): void
     {
         $e = null;
         try {