Improved performance of LoggerDataCollector

symfony · fabpot · Jan 6, 2019 · Jan 3, 2019 · Jan 6, 2019 · 3b8d6d19ec3f0655bf400bdc7c0e82b10165147c
commit 3b8d6d19ec3f0655bf400bdc7c0e82b10165147c
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -66,7 +66,9 @@ public function lateCollect()
        if (null !== $this->logger) {
            $containerDeprecationLogs = $this->getContainerDeprecationLogs();
            $this->data = $this->computeErrorsCount($containerDeprecationLogs);
-            $this->data['compiler_logs'] = $this->getContainerCompilerLogs();
+            // get compiler logs later (only when they are needed) to improve performance
+            $this->data['compiler_logs'] = array();
+            $this->data['compiler_logs_filepath'] = $this->containerPathPrefix.'Compiler.log';
            $this->data['logs'] = $this->sanitizeLogs(array_merge($this->logger->getLogs($this->currentRequest), $containerDeprecationLogs));
            $this->data = $this->cloneVar($this->data);
        }
@@ -110,7 +112,7 @@ public function countScreams()

    public function getCompilerLogs()
    {
-        return isset($this->data['compiler_logs']) ? $this->data['compiler_logs'] : array();
+        return $this->cloneVar($this->getContainerCompilerLogs($this->data['compiler_logs_filepath'] ?? null));
    }

    /**
@@ -143,14 +145,14 @@ private function getContainerDeprecationLogs()
        return $logs;
    }

-    private function getContainerCompilerLogs()
+    private function getContainerCompilerLogs(?string $compilerLogsFilepath = null): array
    {
-        if (null === $this->containerPathPrefix || !file_exists($file = $this->containerPathPrefix.'Compiler.log')) {
+        if (!file_exists($compilerLogsFilepath)) {
            return array();
        }

        $logs = array();
-        foreach (file($file, FILE_IGNORE_NEW_LINES) as $log) {
+        foreach (file($compilerLogsFilepath, FILE_IGNORE_NEW_LINES) as $log) {
            $log = explode(': ', $log, 2);
            if (!isset($log[1]) || !preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $log[0])) {
                $log = array('Unknown Compiler Pass', implode(': ', $log));