Skip to content

Commit 5e5eed5

Browse files
author
Konstantin Myakshin
committed
Automatically enable traceable producer depends on debug
1 parent 3bea096 commit 5e5eed5

3 files changed

Lines changed: 91 additions & 52 deletions

File tree

‎pkg/enqueue-bundle/DependencyInjection/Configuration.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,21 @@
1010

1111
class Configuration implements ConfigurationInterface
1212
{
13+
private $debug;
14+
1315
/**
1416
* @var TransportFactoryInterface[]
1517
*/
1618
private $factories;
1719

1820
/**
1921
* @param TransportFactoryInterface[] $factories
22+
* @param bool $debug
2023
*/
21-
public function __construct(array $factories)
24+
public function __construct(array $factories, $debug = false)
2225
{
2326
$this->factories = $factories;
27+
$this->debug = $debug;
2428
}
2529

2630
/**
@@ -41,8 +45,8 @@ public function getConfigTreeBuilder()
4145
}
4246

4347
$rootNode->children()
44-
->arrayNode('client')->children()
45-
->booleanNode('traceable_producer')->defaultFalse()->end()
48+
->arrayNode('client')->addDefaultsIfNotSet()->children()
49+
->booleanNode('traceable_producer')->defaultValue($this->debug)->end()
4650
->scalarNode('prefix')->defaultValue('enqueue')->end()
4751
->scalarNode('app_name')->defaultValue('app')->end()
4852
->scalarNode('router_topic')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()

‎pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function addTransportFactory(TransportFactoryInterface $transportFactory)
5656
*/
5757
public function load(array $configs, ContainerBuilder $container)
5858
{
59-
$config = $this->processConfiguration(new Configuration($this->factories), $configs);
59+
$config = $this->processConfiguration($this->getConfiguration($configs, $container), $configs);
6060

6161
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
6262
$loader->load('services.yml');
@@ -77,7 +77,7 @@ public function load(array $configs, ContainerBuilder $container)
7777
}
7878
}
7979

80-
if (isset($config['transport']['default']['alias']) && false == isset($config['transport'][$config['transport']['default']['alias']])) {
80+
if (isset($config['transport']['default']['alias']) && !isset($config['transport'][$config['transport']['default']['alias']])) {
8181
throw new \LogicException(sprintf('Transport is not enabled: %s', $config['transport']['default']['alias']));
8282
}
8383

@@ -95,7 +95,7 @@ public function load(array $configs, ContainerBuilder $container)
9595
$container->setParameter('enqueue.client.router_queue_name', $config['client']['router_queue']);
9696
$container->setParameter('enqueue.client.default_queue_name', $config['client']['default_processor_queue']);
9797

98-
if (false == empty($config['client']['traceable_producer'])) {
98+
if ($config['client']['traceable_producer']) {
9999
$container->register(TraceableProducer::class, TraceableProducer::class)
100100
->setDecoratedService(Producer::class)
101101
->addArgument(new Reference(sprintf('%s.inner', TraceableProducer::class)))
@@ -125,7 +125,7 @@ public function load(array $configs, ContainerBuilder $container)
125125
}
126126

127127
if ($config['job']) {
128-
if (false == class_exists(Job::class)) {
128+
if (!class_exists(Job::class)) {
129129
throw new \LogicException('Seems "enqueue/job-queue" is not installed. Please fix this issue.');
130130
}
131131

@@ -167,7 +167,7 @@ public function getConfiguration(array $config, ContainerBuilder $container)
167167

168168
$container->addResource(new FileResource($rc->getFileName()));
169169

170-
return new Configuration($this->factories);
170+
return new Configuration($this->factories, $container->getParameter('kernel.debug'));
171171
}
172172

173173
public function prepend(ContainerBuilder $container)
@@ -177,19 +177,19 @@ public function prepend(ContainerBuilder $container)
177177

178178
private function registerJobQueueDoctrineEntityMapping(ContainerBuilder $container)
179179
{
180-
if (false == class_exists(Job::class)) {
180+
if (!class_exists(Job::class)) {
181181
return;
182182
}
183183

184184
$bundles = $container->getParameter('kernel.bundles');
185185

186-
if (false == isset($bundles['DoctrineBundle'])) {
186+
if (!isset($bundles['DoctrineBundle'])) {
187187
return;
188188
}
189189

190190
foreach ($container->getExtensionConfig('doctrine') as $config) {
191191
// do not register mappings if dbal not configured.
192-
if (false == empty($config['dbal'])) {
192+
if (!empty($config['dbal'])) {
193193
$rc = new \ReflectionClass(Job::class);
194194
$jobQueueRootDir = dirname($rc->getFileName());
195195
$container->prependExtensionConfig('doctrine', [

0 commit comments

Comments
 (0)