fix race condition

laravel · May 8, 2024 · 0612fad · 0612fad
1 parent 9ac51d3
commit 0612fad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/Servers/Reverb/Publishing/RedisPubSubProvider.php b/src/Servers/Reverb/Publishing/RedisPubSubProvider.php
@@ -51,11 +51,12 @@ public function subscribe(): void
     {
         $this->ensureConnected();
 
-        $this->subscribingClient->subscribe($this->channel);
-
-        $this->subscribingClient->on('message', function (string $channel, string $payload) {
-            $this->messageHandler->handle($payload);
-        });
+        $this->subscribingClient->subscribe($this->channel)
+            ->then(function () {
+                $this->subscribingClient->on('message', function (string $channel, string $payload) {
+                    $this->messageHandler->handle($payload);
+                });
+            });
     }
 
     /**

diff --git a/tests/Feature/Protocols/Pusher/Reverb/ChannelControllerTest.php b/tests/Feature/Protocols/Pusher/Reverb/ChannelControllerTest.php
@@ -69,15 +69,13 @@
 });
 
 it('can gather data for a single channel', function () {
-    $start = microtime(true);
     $this->usingRedis();
 
     subscribe('test-channel-one');
     subscribe('test-channel-one');
 
     $response = await($this->signedRequest('channels/test-channel-one?info=user_count,subscription_count,cache'));
 
-    dump("Time: %f\n", microtime(true) - $start);
     expect($response->getStatusCode())->toBe(200);
     expect($response->getBody()->getContents())->toBe('{"occupied":true,"subscription_count":2}');
 });