diff --git a/src/Connection.php b/src/Connection.php index 43cec9d..66b03ab 100644 --- a/src/Connection.php +++ b/src/Connection.php @@ -70,7 +70,7 @@ abstract class Connection $this->logger->info('Feature Negotiation: '.http_build_query($this->features)); - $this->send('IDENTIFY '.PHP_EOL.$size.$body)->getResponse()->okOrFail(); + $this->sendWithResponse('IDENTIFY '.PHP_EOL.$size.$body)->okOrFail(); } /** @@ -142,8 +142,10 @@ abstract class Connection return new Response(new ByteBuffer($socket->read($size))); } - protected function getResponse(): Response + protected function sendWithResponse(string $buffer): Response { + $this->send($buffer); + $response = $this->receive(0.1); if (null === $response) { diff --git a/src/Consumer.php b/src/Consumer.php index 9ed7e7d..5b0a699 100644 --- a/src/Consumer.php +++ b/src/Consumer.php @@ -15,7 +15,7 @@ class Consumer extends Connection { $buffer = sprintf('SUB %s %s', $topic, $channel).PHP_EOL; - $this->send($buffer)->getResponse()->okOrFail(); + $this->sendWithResponse($buffer)->okOrFail(); } /** diff --git a/src/Producer.php b/src/Producer.php index 99ba84b..3740938 100644 --- a/src/Producer.php +++ b/src/Producer.php @@ -21,7 +21,7 @@ final class Producer extends Connection $buffer = 'PUB '.$topic.PHP_EOL.$size.$body; - $this->send($buffer)->getResponse()->okOrFail(); + $this->sendWithResponse($buffer)->okOrFail(); } /** @@ -41,7 +41,7 @@ final class Producer extends Connection $buffer = 'MPUB '.$topic.PHP_EOL.$size.$num.$mb; - $this->send($buffer)->getResponse()->okOrFail(); + $this->sendWithResponse($buffer)->okOrFail(); } /** @@ -53,6 +53,6 @@ final class Producer extends Connection $buffer = sprintf('DPUB %s %s', $topic, $deferTime).PHP_EOL.$size.$body; - $this->send($buffer)->getResponse()->okOrFail(); + $this->sendWithResponse($buffer)->okOrFail(); } }