Fix logging of response errors

Two things were incorrect previously: - Logging was at Debug and Info, raised to Warning so it shows in logs by default - Body and responseBody were not being passed to the logging method correctly Related to #95
elastic · Jun 18, 2014 · 7d91545 · 7d91545
1 parent 8dace3f
commit 7d91545
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/Elasticsearch/Connections/AbstractConnection.php b/src/Elasticsearch/Connections/AbstractConnection.php
@@ -175,8 +175,8 @@ public function logRequestFail(
         $exception = null
     ) {
         $this->log->debug('Request Body', array($body));
-        $this->log->info(
-            'Request Success:',
+        $this->log->warning(
+            'Request Failure:',
             array(
                 'method'    => $method,
                 'uri'       => $fullURI,
@@ -186,7 +186,7 @@ public function logRequestFail(
                 'error'     => $exception,
             )
         );
-        $this->log->debug('Response', array($response));
+        $this->log->warning('Response', array($response));
 
         // Build the curl command for Trace.
         $curlCommand = $this->buildCurlCommand($method, $fullURI, $body);

diff --git a/src/Elasticsearch/Connections/CurlMultiConnection.php b/src/Elasticsearch/Connections/CurlMultiConnection.php
@@ -207,9 +207,9 @@ public function performRequest($method, $uri, $params = null, $body = null, $opt
         }
 
         if ($response['requestInfo']['http_code'] >= 400 && $response['requestInfo']['http_code'] < 500) {
-            $this->process4xxError($method, $uri, $response);
+            $this->process4xxError($method, $uri, $body, $response);
         } else if ($response['requestInfo']['http_code'] >= 500) {
-            $this->process5xxError($method, $uri, $response);
+            $this->process5xxError($method, $uri, $body, $response);
         }
 
         $this->lastRequest['response']['body']    = $response['responseText'];
@@ -257,9 +257,9 @@ public function getLastRequestInfo()
      * @throws \Elasticsearch\Common\Exceptions\Missing404Exception
      * @throws \Elasticsearch\Common\Exceptions\AlreadyExpiredException
      */
-    private function process4xxError($method, $uri, $response)
+    private function process4xxError($method, $uri, $request, $response)
     {
-        $this->logErrorDueToFailure($method, $uri, $response);
+        $this->logErrorDueToFailure($method, $uri, $request, $response);
 
         $statusCode    = $response['requestInfo']['http_code'];
         $exceptionText = $response['error'];
@@ -293,9 +293,9 @@ private function process4xxError($method, $uri, $response)
      * @throws \Elasticsearch\Common\Exceptions\NoDocumentsToGetException
      * @throws \Elasticsearch\Common\Exceptions\ServerErrorResponseException
      */
-    private function process5xxError($method, $uri, $response)
+    private function process5xxError($method, $uri, $request, $response)
     {
-        $this->logErrorDueToFailure($method, $uri, $response);
+        $this->logErrorDueToFailure($method, $uri, $request, $response);
 
         $statusCode    = $response['requestInfo']['http_code'];
         $exceptionText = $response['error'];
@@ -334,17 +334,19 @@ private function processCurlError($method, $uri, $response)
     /**
      * @param $method
      * @param $uri
+     * @param $request
      * @param $response
      */
-    private function logErrorDueToFailure($method, $uri, $response)
+    private function logErrorDueToFailure($method, $uri, $request, $response)
     {
         $this->logRequestFail(
             $method,
             $uri,
-            $response['requestInfo']['total_time'],
+            $request,
             $response['requestInfo']['http_code'],
             $response['responseText'],
-            $response['error']
+            $response['error'],
+            $response
         );
     }
 

diff --git a/src/Elasticsearch/Connections/GuzzleConnection.php b/src/Elasticsearch/Connections/GuzzleConnection.php
@@ -288,10 +288,10 @@ private function logErrorDueToFailure(Request $request, \Exception $exception, $
         $this->logRequestFail(
             $request->getMethod(),
             $request->getUrl(),
-            $response->getInfo('total_time'),
+            $body,
             $headers,
             $response->getStatusCode(),
-            $body,
+            $responseBody,
             $exception->getMessage()
         );
     }