timing by connection

doctrine · May 1, 2024 · 9dce667 · 9dce667
1 parent d9b2892
commit 9dce667
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -114,8 +114,6 @@ private function addDbalSection(ArrayNodeDefinition $node): void
                 ->children()
                     ->scalarNode('default_connection')->end()
                 ->end()
-                ->children()
-                    ->integerNode('check_connection_timing')->end()
                 ->fixXmlConfig('type')
                 ->children()
                     ->arrayNode('types')
@@ -223,6 +221,7 @@ private function getDbalConnectionsNode(): ArrayNodeDefinition
                 ->end()
                 ->booleanNode('disable_type_comments')->end()
                 ->scalarNode('server_version')->end()
+                ->integerNode('check_connection_timing')->end()
                 ->scalarNode('driver_class')->end()
                 ->scalarNode('wrapper_class')->end()
                 ->scalarNode('check_connection_frequency')->defaultValue(30)->end()

diff --git a/src/DependencyInjection/DoctrineExtension.php b/src/DependencyInjection/DoctrineExtension.php
@@ -202,6 +202,14 @@ protected function dbalLoad(array $config, ContainerBuilder $container)
         $connWithLogging   = [];
         $connWithProfiling = [];
         $connWithBacktrace = [];
+        $timingByConnection = [];
+        $skipTiming = false;
+
+        if (! $container->hasParameter('kernel.runtime_mode') && ! $container->hasParameter('kernel.runtime_mode.worker')) {
+            $container->removeDefinition('doctrine.listeners.doctrine_connection_listener');
+            $skipTiming = true;
+        }
+
         foreach ($config['connections'] as $name => $connection) {
             if ($connection['logging']) {
                 $connWithLogging[] = $name;
@@ -215,9 +223,17 @@ protected function dbalLoad(array $config, ContainerBuilder $container)
                 }
             }
 
+            if (! $skipTiming) {
+                $timingByConnection[] = ['name' => $connections[$name], 'timing' => $connection['check_connection_timing']];
+            }
+
             $this->loadDbalConnection($name, $connection, $container);
         }
 
+        if (! $skipTiming) {
+            $container->getDefinition('doctrine.orm.listeners.doctrine_connection_listener')->setArgument(1, $timingByConnection);
+        }
+
         $container->registerForAutoconfiguration(MiddlewareInterface::class)->addTag('doctrine.middleware');
 
         $container->registerAttributeForAutoconfiguration(AsMiddleware::class, static function (ChildDefinition $definition, AsMiddleware $attribute) {
@@ -258,12 +274,6 @@ protected function loadDbalConnection($name, array $connection, ContainerBuilder
             $connection['profiling_collect_schema_errors'],
         );
 
-        if (isset($connection['check_connection_timing'])) {
-            if ($container->hasParameter('kernel.runtime_mode') || $container->hasParameter('kernel.runtime_mode.worker')) {
-                $configuration->addMethodCall('setCheckConnectionTiming', [$connection['check_connection_timing']]);
-            }
-        }
-
         if (isset($connection['auto_commit'])) {
             $configuration->addMethodCall('setAutoCommit', [$connection['auto_commit']]);
         }