Cleaned up logging behaviour and fixed bug on setting daemon logger

Author: AndrewCarterUK

src/Daemon.php

@@ -6,7 +6,6 @@
 use PHPFastCGI\FastCGIDaemon\ConnectionHandler\ConnectionHandlerFactoryInterface;
 use PHPFastCGI\FastCGIDaemon\Exception\ShutdownException;
 use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
@@ -16,8 +15,6 @@
  */
 class Daemon implements DaemonInterface, LoggerAwareInterface
 {
-    use LoggerAwareTrait;
-
     /**
      * @var ConnectionPoolInterface
      */
@@ -28,6 +25,11 @@ class Daemon implements DaemonInterface, LoggerAwareInterface
      */
     private $connectionHandlerFactory;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * Constructor.
      *
@@ -41,10 +43,14 @@ public function __construct(ConnectionPoolInterface $connectionPool, ConnectionH
         $this->connectionHandlerFactory = $connectionHandlerFactory;
 
         $this->setLogger((null === $logger) ? new NullLogger() : $logger);
+    }
 
-        if ($this->connectionPool instanceof LoggerAwareInterface) {
-            $this->connectionPool->setLogger($this->logger);
-        }
+    /**
+     * {@inheritdoc}
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
 
         if ($this->connectionHandlerFactory instanceof LoggerAwareInterface) {
             $this->connectionHandlerFactory->setLogger($this->logger);

test/Connection/CallableConnectionPool.php

@@ -4,17 +4,12 @@
 
 use PHPFastCGI\FastCGIDaemon\Connection\ConnectionPoolInterface;
 use PHPFastCGI\FastCGIDaemon\ConnectionHandler\ConnectionHandlerFactoryInterface;
-use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
-use Psr\Log\LoggerInterface;
 
 /**
  * Implementation of ConnectionHandlerInterface using callbacks.
  */
-class CallableConnectionPool implements ConnectionPoolInterface, LoggerAwareInterface
+class CallableConnectionPool implements ConnectionPoolInterface
 {
-    use LoggerAwareTrait;
-
     /**
      * @var callable
      */
@@ -37,16 +32,6 @@ public function __construct($callback, $shutdownCallback = null)
         $this->shutdownCallback = $shutdownCallback;
     }
 
-    /**
-     * Return the current logger
-     * 
-     * @return LoggerInterface
-     */
-    public function getLogger()
-    {
-        return $this->logger;
-    }
-
     /**
      * {@inheritdoc}
      */

test/DaemonTest.php

@@ -37,7 +37,6 @@ public function testRun()
 
         // Test loggers have been set
         $this->assertSame($logger, $mockConnectionHandlerFactory->getLogger());
-        $this->assertSame($logger, $mockConnectionPool->getLogger());
 
         try {
             $daemon->run();