Skip to content

Commit 9c72fc3

Browse files
committed
feat: move bwloe code and remove connName in channel
1 parent 1aafca1 commit 9c72fc3

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

src/DependencyInjection/DoctrineExtension.php

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,6 +1450,19 @@ private function registerDbalMiddlewares(
14501450
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
14511451
$loader->load('middlewares.php');
14521452

1453+
$container->getDefinition('doctrine.debug_data_holder')->replaceArgument(0, $connWithBacktrace);
1454+
$debugMiddlewareAbstractDef = $container->getDefinition('doctrine.dbal.debug_middleware');
1455+
foreach ($connWithProfiling as $connName) {
1456+
$debugMiddlewareAbstractDef
1457+
->addTag('doctrine.middleware', ['connection' => $connName, 'priority' => 10]);
1458+
}
1459+
1460+
$idleConnectionMiddlewareAbstractDef = $container->getDefinition('doctrine.dbal.idle_connection_middleware');
1461+
foreach ($connWithTtl as $connName) {
1462+
$idleConnectionMiddlewareAbstractDef
1463+
->addTag('doctrine.middleware', ['connection' => $connName, 'priority' => 10]);
1464+
}
1465+
14531466
$loggingMiddlewareAbstractDef = $container->getDefinition('doctrine.dbal.logging_middleware');
14541467

14551468
foreach ($connWithLogging as $connName) {
@@ -1461,25 +1474,11 @@ private function registerDbalMiddlewares(
14611474
// Preserve legacy behavior: also tag the abstract definition per-connection
14621475
$loggingMiddlewareAbstractDef->addTag('doctrine.middleware', ['connection' => $connName, 'priority' => 10]);
14631476

1464-
// Create a child service with a dedicated Monolog channel
1477+
// Create a child service for the connection
14651478
$id = sprintf('doctrine.dbal.logging_middleware.%s', $connName);
14661479
$child = new ChildDefinition('doctrine.dbal.logging_middleware');
14671480
$child->addTag('doctrine.middleware', ['connection' => $connName, 'priority' => 10]);
1468-
$child->addTag('monolog.logger', ['channel' => sprintf('doctrine.%s', $connName)]);
14691481
$container->setDefinition($id, $child);
14701482
}
1471-
1472-
$container->getDefinition('doctrine.debug_data_holder')->replaceArgument(0, $connWithBacktrace);
1473-
$debugMiddlewareAbstractDef = $container->getDefinition('doctrine.dbal.debug_middleware');
1474-
foreach ($connWithProfiling as $connName) {
1475-
$debugMiddlewareAbstractDef
1476-
->addTag('doctrine.middleware', ['connection' => $connName, 'priority' => 10]);
1477-
}
1478-
1479-
$idleConnectionMiddlewareAbstractDef = $container->getDefinition('doctrine.dbal.idle_connection_middleware');
1480-
foreach ($connWithTtl as $connName) {
1481-
$idleConnectionMiddlewareAbstractDef
1482-
->addTag('doctrine.middleware', ['connection' => $connName, 'priority' => 10]);
1483-
}
14841483
}
14851484
}

0 commit comments

Comments
 (0)