From f8a445b46c939f04bc06a7f1d7631aca12ac618b Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 23 May 2014 23:11:45 +1000
Subject: [PATCH] Fix disabling of logger in DoctrineProvider

---
 DependencyInjection/Configuration.php | 5 ++++-
 Doctrine/AbstractProvider.php         | 6 +++---
 Resources/doc/types.md                | 9 ++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 154abcc..d84cd3c 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -189,7 +189,10 @@ class Configuration implements ConfigurationInterface
                                                 ->children()
                                                     ->scalarNode('batch_size')->defaultValue(100)->end()
                                                     ->scalarNode('clear_object_manager')->defaultTrue()->end()
-                                                    ->scalarNode('disable_logger')->defaultValue('%kernel.debug%')->end()
+                                                    ->booleanNode('debug_logging')
+                                                        ->defaultValue($this->debug)
+                                                        ->treatNullLike($this->debug)
+                                                    ->end()
                                                     ->scalarNode('query_builder_method')->defaultValue('createQueryBuilder')->end()
                                                     ->scalarNode('service')->end()
                                                 ->end()
diff --git a/Doctrine/AbstractProvider.php b/Doctrine/AbstractProvider.php
index 1c3f853..b9ffda5 100644
--- a/Doctrine/AbstractProvider.php
+++ b/Doctrine/AbstractProvider.php
@@ -23,7 +23,7 @@ abstract class AbstractProvider extends BaseAbstractProvider
     {
         parent::__construct($objectPersister, $objectClass, array_merge(array(
             'clear_object_manager' => true,
-            'disable_logging'      => false,
+            'debug_logging'        => false,
             'ignore_errors'        => false,
             'query_builder_method' => 'createQueryBuilder',
         ), $options));
@@ -36,7 +36,7 @@ abstract class AbstractProvider extends BaseAbstractProvider
      */
     public function populate(\Closure $loggerClosure = null, array $options = array())
     {
-        if (!$this->options['disable_logging']) {
+        if (!$this->options['debug_logging']) {
             $logger = $this->disableLogging();
         }
 
@@ -82,7 +82,7 @@ abstract class AbstractProvider extends BaseAbstractProvider
             }
         }
 
-        if (!$this->options['disable_logging']) {
+        if (!$this->options['debug_logging']) {
             $this->enableLogging($logger);
         }
     }
diff --git a/Resources/doc/types.md b/Resources/doc/types.md
index aa76a43..aacb09e 100644
--- a/Resources/doc/types.md
+++ b/Resources/doc/types.md
@@ -191,16 +191,15 @@ persistence configuration.
 ### Turning on the persistence backend logger in production
 
 FOSElasticaBundle will turn of your persistence backend's logging configuration by default
-when Symfony2 is not in debug mode.
-
-To enable the logger (turn off this behaviour) set disable_logger to false for the
-provider
+when Symfony2 is not in debug mode. You can force FOSElasticaBundle to always disable
+logging by setting debug_logging to false, to leave logging alone by setting it to true,
+or leave it set to its default value which will mirror %kernel.debug%.
 
 ```yaml
                 user:
                     persistence:
                         provider:
-                            disable_logger: false
+                            debug_logging: false
 ```
 
 Listener Configuration