[HttpKernel] Don't clean legacy containers that are still loaded

nicolas-grekas · nicolas-grekas · commit be8dbc36603d · 2018-04-26T16:53:34.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -670,9 +670,11 @@ protected function initializeContainer()
             // Because concurrent requests might still be using them,
             // old container files are not removed immediately,
             // but on a next dump of the container.
+            static $legacyContainers = array();
             $oldContainerDir = dirname($oldContainer->getFileName());
-            foreach (glob(dirname($oldContainerDir).'/*.legacy') as $legacyContainer) {
-                if ($oldContainerDir.'.legacy' !== $legacyContainer && @unlink($legacyContainer)) {
+            $legacyContainers[$oldContainerDir.'.legacy'] = true;
+            foreach (glob(dirname($oldContainerDir).DIRECTORY_SEPARATOR.'*.legacy') as $legacyContainer) {
+                if (!isset($legacyContainers[$legacyContainer]) && @unlink($legacyContainer)) {
                     (new Filesystem())->remove(substr($legacyContainer, 0, -7));
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -670,9 +670,11 @@ protected function initializeContainer()`
`670`	`670`	`// Because concurrent requests might still be using them,`
`671`	`671`	`// old container files are not removed immediately,`
`672`	`672`	`// but on a next dump of the container.`
	`673`	`+ static $legacyContainers = array();`
`673`	`674`	`$oldContainerDir = dirname($oldContainer->getFileName());`
`674`		`- foreach (glob(dirname($oldContainerDir).'/*.legacy') as $legacyContainer) {`
`675`		`- if ($oldContainerDir.'.legacy' !== $legacyContainer && @unlink($legacyContainer)) {`
	`675`	`+ $legacyContainers[$oldContainerDir.'.legacy'] = true;`
	`676`	`+ foreach (glob(dirname($oldContainerDir).DIRECTORY_SEPARATOR.'*.legacy') as $legacyContainer) {`
	`677`	`+ if (!isset($legacyContainers[$legacyContainer]) && @unlink($legacyContainer)) {`
`676`	`678`	`(new Filesystem())->remove(substr($legacyContainer, 0, -7));`
`677`	`679`	`}`
`678`	`680`	`}`