Fix logger middleware that did not log errors

Author: phpbg

src/Middleware/Log.php

@@ -32,6 +32,7 @@
 use Psr\Log\LogLevel;
 use React\Promise\FulfilledPromise;
 use React\Promise\PromiseInterface;
+use function React\Promise\reject;
 use React\Socket\ConnectionInterface;
 
 /**
@@ -42,11 +43,19 @@ class Log
 
     private $logger;
     private $level;
+    private $errorLevel;
 
-    public function __construct(LoggerInterface $logger, $level = LogLevel::DEBUG)
+    /**
+     * Log constructor.
+     * @param LoggerInterface $logger
+     * @param string $level Standard request / response log level
+     * @param string $errorLevel Errors log level
+     */
+    public function __construct(LoggerInterface $logger, $level = LogLevel::DEBUG, $errorLevel = LogLevel::WARNING)
     {
         $this->logger = $logger;
         $this->level = $level;
+        $this->errorLevel = $errorLevel;
     }
 
     /**
@@ -67,6 +76,13 @@ public function __invoke(Request $request, ConnectionInterface $connection, call
         return $response->then(function (Response $resolvedResponse) use ($request) {
             $this->logger->log($this->level, "Response:\r\n$resolvedResponse");
             return $resolvedResponse;
+        }, function($reason) {
+            if ($reason instanceof \Exception) {
+                $this->logger->log("Internal server error", ['exception' => $reason]);
+            } else {
+                $this->logger->log("Unexpected internal server error", ['data' => $reason]);
+            }
+            return reject($reason);
         });
     }
 }

tests/Middleware/LogTest.php

@@ -33,12 +33,14 @@
 use PhpBg\Rtsp\Tests\ConnectionStub;
 use PhpBg\Rtsp\Tests\Mock\EmptyResponseMiddleware;
 use PhpBg\Rtsp\Tests\Mock\ParametrizedResponseMiddleware;
+use PhpBg\Rtsp\Tests\Mock\RejectMiddleware;
 use Psr\Log\LoggerInterface;
 use React\Promise\PromiseInterface;
+use React\Promise\RejectedPromise;
 
 class LogTest extends MockeryTestCase
 {
-    public function testAddHeader() {
+    public function testResolved() {
         $logger = \Mockery::spy(LoggerInterface::class);
         $middleware = new Log($logger);
 
@@ -55,4 +57,26 @@ public function testAddHeader() {
         $this->assertTrue($extractedResponse instanceof Response);
         $logger->shouldHaveReceived('log')->twice();
     }
+
+    public function testRejectedString() {
+        $logger = \Mockery::spy(LoggerInterface::class);
+        $middleware = new Log($logger);
+        $request = new Request();
+
+        $response = $middleware($request, new ConnectionStub(), new RejectMiddleware('foo'));
+
+        $this->assertTrue($response instanceof RejectedPromise);
+        $logger->shouldHaveReceived('log')->twice();
+    }
+
+    public function testRejectedException() {
+        $logger = \Mockery::spy(LoggerInterface::class);
+        $middleware = new Log($logger);
+        $request = new Request();
+
+        $response = $middleware($request, new ConnectionStub(), new RejectMiddleware(new \Exception('foo')));
+
+        $this->assertTrue($response instanceof RejectedPromise);
+        $logger->shouldHaveReceived('log')->twice();
+    }
 }

tests/Mock/RejectMiddleware.php

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * MIT License
+ *
+ * Copyright (c) 2018 Samuel CHEMLA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace PhpBg\Rtsp\Tests\Mock;
+
+use PhpBg\Rtsp\Message\Request;
+use React\Promise\RejectedPromise;
+use React\Socket\ConnectionInterface;
+
+class RejectMiddleware
+{
+    private $rejectValue;
+
+    public function __construct($rejectValue)
+    {
+        $this->rejectValue = $rejectValue;
+    }
+
+    public function __invoke(Request $request, ConnectionInterface $connection)
+    {
+        return new RejectedPromise($this->rejectValue);
+    }
+}