Modify _log to provide more context

Author: merk

lib/Elastica/Client.php

@@ -621,17 +621,15 @@ public function bulk(array $params)
     public function request($path, $method = Request::GET, $data = array(), array $query = array())
     {
         $connection = $this->getConnection();
+        $request = null;
+        $response = null;
+
         try {
             $request = new Request($path, $method, $data, $query, $connection);
-
-            $this->_log($request);
-
             $response = $request->send();
 
             $this->_lastRequest = $request;
             $this->_lastResponse = $response;
-
-            return $response;
         } catch (ConnectionException $e) {
             $this->_connectionPool->onFail($connection, $e, $this);
 
@@ -642,6 +640,10 @@ public function request($path, $method = Request::GET, $data = array(), array $q
 
             return $this->request($path, $method, $data, $query);
         }
+
+        $this->_log($request, $response);
+
+        return $response;
     }
 
     /**
@@ -673,29 +675,41 @@ public function refreshAll()
     /**
      * Log a request if the logger is present.
      *
-     * @param \Elastica\Request $request
-     *
-     * @throws Exception\RuntimeException
+     * @param Request $request
+     * @param Response $response
      */
-    protected function _log(Request $request)
+    protected function _log(Request $request, Response $response = null)
     {
         if (!$this->_logger) {
             return;
         }
 
-        $this->_logger->debug('Elastica Request', $request->toArray());
+        $this->_logger->debug('Elastica Request', [
+            'request' => $request->toArray(),
+            'response' => $response ? $response->getData() : null
+        ]);
     }
 
     /**
-     * @return \Elastica\Request
+     * Replace the existing logger.
+     *
+     * @param LoggerInterface $logger
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->_logger = $logger;
+    }
+
+    /**
+     * @return Request
      */
     public function getLastRequest()
     {
         return $this->_lastRequest;
     }
 
     /**
-     * @return \Elastica\Response
+     * @return Response
      */
     public function getLastResponse()
     {