Fix disabling of logger in DoctrineProvider
This commit is contained in:
parent
d532e6b1e3
commit
f8a445b46c
|
@ -189,7 +189,10 @@ class Configuration implements ConfigurationInterface
|
||||||
->children()
|
->children()
|
||||||
->scalarNode('batch_size')->defaultValue(100)->end()
|
->scalarNode('batch_size')->defaultValue(100)->end()
|
||||||
->scalarNode('clear_object_manager')->defaultTrue()->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('query_builder_method')->defaultValue('createQueryBuilder')->end()
|
||||||
->scalarNode('service')->end()
|
->scalarNode('service')->end()
|
||||||
->end()
|
->end()
|
||||||
|
|
|
@ -23,7 +23,7 @@ abstract class AbstractProvider extends BaseAbstractProvider
|
||||||
{
|
{
|
||||||
parent::__construct($objectPersister, $objectClass, array_merge(array(
|
parent::__construct($objectPersister, $objectClass, array_merge(array(
|
||||||
'clear_object_manager' => true,
|
'clear_object_manager' => true,
|
||||||
'disable_logging' => false,
|
'debug_logging' => false,
|
||||||
'ignore_errors' => false,
|
'ignore_errors' => false,
|
||||||
'query_builder_method' => 'createQueryBuilder',
|
'query_builder_method' => 'createQueryBuilder',
|
||||||
), $options));
|
), $options));
|
||||||
|
@ -36,7 +36,7 @@ abstract class AbstractProvider extends BaseAbstractProvider
|
||||||
*/
|
*/
|
||||||
public function populate(\Closure $loggerClosure = null, array $options = array())
|
public function populate(\Closure $loggerClosure = null, array $options = array())
|
||||||
{
|
{
|
||||||
if (!$this->options['disable_logging']) {
|
if (!$this->options['debug_logging']) {
|
||||||
$logger = $this->disableLogging();
|
$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);
|
$this->enableLogging($logger);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -191,16 +191,15 @@ persistence configuration.
|
||||||
### Turning on the persistence backend logger in production
|
### Turning on the persistence backend logger in production
|
||||||
|
|
||||||
FOSElasticaBundle will turn of your persistence backend's logging configuration by default
|
FOSElasticaBundle will turn of your persistence backend's logging configuration by default
|
||||||
when Symfony2 is not in debug mode.
|
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,
|
||||||
To enable the logger (turn off this behaviour) set disable_logger to false for the
|
or leave it set to its default value which will mirror %kernel.debug%.
|
||||||
provider
|
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
user:
|
user:
|
||||||
persistence:
|
persistence:
|
||||||
provider:
|
provider:
|
||||||
disable_logger: false
|
debug_logging: false
|
||||||
```
|
```
|
||||||
|
|
||||||
Listener Configuration
|
Listener Configuration
|
||||||
|
|
Loading…
Reference in a new issue