Simplify Client logger

Author: merk

lib/Elastica/Client.php

@@ -8,6 +8,7 @@
 use Elastica\Exception\RuntimeException;
 use Elastica\Script\AbstractScript;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 /**
  * Client to connect the the elasticsearch server.
@@ -46,7 +47,7 @@ class Client
     /**
      * @var callback
      */
-    protected $_callback = null;
+    protected $_callback;
 
     /**
      * @var \Elastica\Request
@@ -61,22 +62,26 @@ class Client
     /**
      * @var LoggerInterface
      */
-    protected $_logger = null;
+    protected $_logger;
+
     /**
      * @var Connection\ConnectionPool
      */
-    protected $_connectionPool = null;
+    protected $_connectionPool;
 
     /**
      * Creates a new Elastica client.
      *
-     * @param array    $config   OPTIONAL Additional config options
+     * @param array $config OPTIONAL Additional config options
      * @param callback $callback OPTIONAL Callback function which can be used to be notified about errors (for example connection down)
+     * @param LoggerInterface $logger
      */
-    public function __construct(array $config = array(), $callback = null)
+    public function __construct(array $config = array(), $callback = null, LoggerInterface $logger = null)
     {
-        $this->setConfig($config);
         $this->_callback = $callback;
+        $this->_logger = $logger ?: new NullLogger();
+
+        $this->setConfig($config);
         $this->_initConnections();
     }
 
@@ -614,32 +619,40 @@ public function bulk(array $params)
      *
      * @throws Exception\ConnectionException|\Exception
      *
-     * @return \Elastica\Response Response object
+     * @return Response Response object
      */
     public function request($path, $method = Request::GET, $data = array(), array $query = array())
     {
         $connection = $this->getConnection();
-        try {
-            $request = new Request($path, $method, $data, $query, $connection);
-
-            $this->_log($request);
-
-            $response = $request->send();
-
-            $this->_lastRequest = $request;
-            $this->_lastResponse = $response;
+        $request = $this->_lastRequest = new Request($path, $method, $data, $query, $connection);
+        $response = null;
 
-            return $response;
+        try {
+            $response = $this->_lastResponse = $request->send();
         } catch (ConnectionException $e) {
             $this->_connectionPool->onFail($connection, $e, $this);
 
+            $this->_logger->error('Elastica Request Failure', [
+                'exception' => $e,
+                'request' => $request->toArray(),
+                'retry' => $this->hasConnection()
+            ]);
+
             // In case there is no valid connection left, throw exception which caused the disabling of the connection.
             if (!$this->hasConnection()) {
                 throw $e;
             }
 
             return $this->request($path, $method, $data, $query);
         }
+
+        $this->_logger->debug('Elastica Request', [
+            'request' => $request->toArray(),
+            'response' => $response->getData(),
+            'responseStatus' => $response->getStatus()
+        ]);
+
+        return $response;
     }
 
     /**
@@ -669,57 +682,28 @@ public function refreshAll()
     }
 
     /**
-     * logging.
+     * Replace the existing logger.
      *
-     * @param string|\Elastica\Request $context
-     *
-     * @throws Exception\RuntimeException
+     * @param LoggerInterface $logger
      */
-    protected function _log($context)
+    public function setLogger(LoggerInterface $logger)
     {
-        $log = $this->getConfig('log');
-        if ($log && !class_exists('Psr\Log\AbstractLogger')) {
-            throw new RuntimeException('Class Psr\Log\AbstractLogger not found');
-        } elseif (!$this->_logger && $log) {
-            $this->setLogger(new Log($this->getConfig('log')));
-        }
-        if ($this->_logger) {
-            if ($context instanceof Request) {
-                $data = $context->toArray();
-            } else {
-                $data = array('message' => $context);
-            }
-            $this->_logger->debug('logging Request', $data);
-        }
+        $this->_logger = $logger;
     }
 
     /**
-     * @return \Elastica\Request
+     * @return Request
      */
     public function getLastRequest()
     {
         return $this->_lastRequest;
     }
 
     /**
-     * @return \Elastica\Response
+     * @return Response
      */
     public function getLastResponse()
     {
         return $this->_lastResponse;
     }
-
-    /**
-     * set Logger.
-     *
-     * @param LoggerInterface $logger
-     *
-     * @return $this
-     */
-    public function setLogger(LoggerInterface $logger)
-    {
-        $this->_logger = $logger;
-
-        return $this;
-    }
 }