Merge pull request #560 from saimaz/patch-profiler

Removed profiler option, from now on it is turned on in dev by default

Author: saimaz

DependencyInjection/Configuration.php

@@ -177,12 +177,8 @@ private function getManagersNode()
                             'The type of commit to the elasticsearch'
                         )
                     ->end()
-                    ->booleanNode('profiler')
-                        ->info('Enables elasticsearch profiler in the Symfony web profiler toolbar.')
-                        ->defaultFalse()
-                    ->end()
                     ->arrayNode('logger')
-                        ->info('Enables logging')
+                        ->info('Enables elasticsearch queries logging')
                         ->addDefaultsIfNotSet()
                         ->beforeNormalization()
                             ->ifTrue(
@@ -202,15 +198,15 @@ function ($v) {
                                 ->defaultFalse()
                             ->end()
                             ->scalarNode('level')
-                                ->info('Sets psr logging level')
+                                ->info('Sets PSR logging level')
                                 ->defaultValue(LogLevel::WARNING)
                                 ->validate()
                                 ->ifNotInArray((new \ReflectionClass('Psr\Log\LogLevel'))->getConstants())
-                                    ->thenInvalid('Invalid Psr log level.')
+                                    ->thenInvalid('Invalid PSR log level.')
                                 ->end()
                             ->end()
                             ->scalarNode('log_file_name')
-                                ->info('Log filename, by default it is manager name')
+                                ->info('Log filename, by default it is a manager name')
                                 ->defaultValue(null)
                             ->end()
                         ->end()

Resources/doc/configuration.md

@@ -46,7 +46,6 @@ ongr_elasticsearch:
     managers:
         default:
             connection: default
-            profiler: true #default %kernel.debug%
             logger: true #default %kernel.debug%
             readonly: false #default false
             mappings:
@@ -55,7 +54,6 @@ ongr_elasticsearch:
             connection: bar
         readonly:
             connection: default
-            profiler: true
             readonly: true
             mappings:
                 - AcmeBarBundle:UserDocument #Includes only one type to the mapping

Service/ManagerFactory.php

@@ -77,12 +77,8 @@ public function createManager($managerName, $connection, $analysis, $managerConf
         $mappings = $this->metadataCollector->getClientMapping($managerConfig['mappings']);
 
         $client = ClientBuilder::create();
-
         $client->setHosts($connection['hosts']);
-
-        if ($this->tracer && $managerConfig['profiler']) {
-            $client->setTracer($this->tracer);
-        }
+        $client->setTracer($this->tracer);
 
         if ($this->logger && $managerConfig['logger']['enabled']) {
             $client->setLogger($this->logger);

Tests/Unit/DependencyInjection/ElasticsearchExtensionTest.php

@@ -64,7 +64,6 @@ public function getData()
         $expectedManagers = [
             'test' => [
                 'connection' => 'test2',
-                'profiler' => false,
                 'logger' => [
                     'enabled' => true,
                     'level' => 'warning',
@@ -91,7 +90,6 @@ public function getData()
                 'managers' => [
                     'test' => [
                         'connection' => 'test2',
-                        'profiler' => true,
                         'logger' => true,
                         'readonly' => false,
                         'mappings' => ['testBundle'],
@@ -103,7 +101,6 @@ public function getData()
         $expectedManagers = [
             'test' => [
                 'connection' => 'test2',
-                'profiler' => true,
                 'logger' => [
                     'enabled' => true,
                     'level' => 'warning',

Tests/app/config/config_test.yml

@@ -22,7 +22,6 @@ ongr_elasticsearch:
     managers:
         default:
             connection: default
-            profiler: true
             logger: true
             mappings:
                 - AcmeBarBundle
@@ -33,7 +32,6 @@ ongr_elasticsearch:
                 - AcmeFooBundle
         readonly:
             connection: default
-            profiler: true
             readonly: true
             mappings:
                 - AcmeBarBundle