Only emit "monitor" event when actually receiving a monitor message

Author: clue

src/StreamingClient.php

@@ -95,8 +95,8 @@ public function handleMessage(ModelInterface $message)
     {
         $this->emit('data', array($message, $this));
 
-        if ($this->monitoring && $message instanceof StatusReply) {
-            $this->emit('monitor', array($message, $this));
+        if ($this->monitoring && $this->isMonitorMessage($message)) {
+            $this->emit('monitor', array($message));
             return;
         }
 
@@ -152,4 +152,10 @@ public function close()
             $request->reject(new RuntimeException('Connection closing'));
         }
     }
+
+    private function isMonitorMessage(ModelInterface $message)
+    {
+        // Check status '1409172115.207170 [0 127.0.0.1:58567] "ping"' contains otherwise uncommon '] "'
+        return ($message instanceof StatusReply && strpos($message->getValueNative(), '] "') !== false);
+    }
 }

tests/FunctionalTest.php

@@ -103,6 +103,21 @@ public function testMultiExecQueuedExecHasValues(StreamingClient $client)
         return $client;
     }
 
+    /**
+     *
+     * @param StreamingClient $client
+     * @depends testPipeline
+     */
+    public function testMonitorPing(StreamingClient $client)
+    {
+        $client->on('monitor', $this->expectCallableOnce());
+
+        $client->monitor()->then($this->expectCallableOnce('OK'));
+        $client->ping()->then($this->expectCallableOnce('PONG'));
+
+        $this->waitFor($client);
+    }
+
     public function testPubSub()
     {
         $consumer = $this->createClient();

tests/StreamingClientTest.php

@@ -5,6 +5,7 @@
 use Clue\Redis\Protocol\Model\IntegerReply;
 use Clue\Redis\Protocol\Model\BulkReply;
 use Clue\Redis\Protocol\Model\ErrorReply;
+use Clue\Redis\Protocol\Model\StatusReply;
 
 class ClientTest extends TestCase
 {
@@ -91,6 +92,52 @@ public function testPingPong()
         $promise->then($this->expectCallableOnce('PONG'));
     }
 
+    /**
+     * @expectedException UnderflowException
+     */
+    public function testInvalidMonitor()
+    {
+        $this->client->handleMessage(new StatusReply('+1409171800.312243 [0 127.0.0.1:58542] "ping"'));
+    }
+
+    public function testMonitor()
+    {
+        $this->serializer->expects($this->once())->method('getRequestMessage')->with($this->equalTo('monitor'));
+
+        $promise = $this->client->monitor();
+
+        $this->client->handleMessage(new StatusReply('OK'));
+
+        $this->expectPromiseResolve($promise);
+        $promise->then($this->expectCallableOnce('OK'));
+
+        return $this->client;
+    }
+
+    /**
+     * @depends testMonitor
+     * @param StreamingClient $client
+     */
+    public function testMonitorEvent(StreamingClient $client)
+    {
+        $client->on('monitor', $this->expectCallableOnce());
+
+        $client->handleMessage(new StatusReply('1409171800.312243 [0 127.0.0.1:58542] "ping"'));
+    }
+
+    /**
+     * @depends testMonitor
+     * @param StreamingClient $client
+     */
+    public function testMonitorPing(StreamingClient $client)
+    {
+        $client->on('monitor', $this->expectCallableOnce());
+
+        $client->ping();
+        $client->handleMessage(new StatusReply('1409171800.312243 [0 127.0.0.1:58542] "ping"'));
+        $client->handleMessage(new StatusReply('PONG'));
+    }
+
     public function testErrorReply()
     {
         $promise = $this->client->invalid();