Merge branch 'master' into 2.0

Author: polyfractal

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Release 2.1.2
+
+- Remove IntrospectionProcessor from default to make logs less noisy [[0a80de4]](http://github.com/elasticsearch/elasticsearch-php/commit/0a80de4)
+- Remove redundant logging on failure [[f31a211]](http://github.com/elasticsearch/elasticsearch-php/commit/f31a211)
+
 ## Release 2.1.1
 
 - More robust error logging during connection failure / retries [[0069fd6]](http://github.com/elasticsearch/elasticsearch-php/commit/0069fd6)

src/Elasticsearch/ClientBuilder.php

@@ -180,9 +180,7 @@ public static function defaultLogger($path, $level = Logger::WARNING)
     {
         $log       = new Logger('log');
         $handler   = new StreamHandler($path, $level);
-        $processor = new IntrospectionProcessor();
         $log->pushHandler($handler);
-        $log->pushProcessor($processor);
 
         return $log;
     }

src/Elasticsearch/Connections/Connection.php

@@ -203,8 +203,9 @@ private function wrapHandler(callable $handler, LoggerInterface $logger, LoggerI
 
                         $neverRetry = isset($request['client']['never_retry']) ? $request['client']['never_retry'] : false;
                         $shouldRetry = $transport->shouldRetry($request);
+                        $shouldRetryText = ($shouldRetry) ? 'true' : 'false';
 
-                        $this->log->warning("Retries left? ". ($shouldRetry) ? 'true' : 'false');
+                        $this->log->warning("Retries left? $shouldRetryText");
                         if ($shouldRetry && !$neverRetry) {
                             return $transport->performRequest(
                                 $request['http_method'],
@@ -488,17 +489,6 @@ protected function getCurlRetryException($request, $response)
                 break;
         }
 
-        $this->logRequestFail(
-            $request['http_method'],
-            $response['effective_url'],
-            $request['body'],
-            $request['headers'],
-            $response['status'],
-            $response['body'],
-            $response['transfer_stats']['total_time'],
-            $exception
-        );
-
         return $exception;
     }