Persist app bootstrapping logs for logger datacollector

symfony · fabpot · Apr 20, 2017 · Apr 11, 2017 · Apr 17, 2017 · Apr 17, 2017
commit ce3ef6a96ef37f46b34452d447c15643383dacb5
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -32,6 +32,7 @@
             <tag name="data_collector" template="@WebProfiler/Collector/logger.html.twig" id="logger" priority="300" />
             <tag name="monolog.logger" channel="profiler" />
             <argument type="service" id="logger" on-invalid="ignore" />
+            <argument>%kernel.cache_dir%/%kernel.container_class%</argument>
         </service>
 
         <service id="data_collector.time" class="Symfony\Component\HttpKernel\DataCollector\TimeDataCollector" public="false">

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -124,6 +124,52 @@
                 </div>
             </div>
 
+            {% set compilerLogTotal = 0 %}
+            {% for logs in collector.compilerLogs %}
+                {% set compilerLogTotal = compilerLogTotal + logs|length %}
+            {% endfor %}
+            <div class="tab">
+                <h3 class="tab-title">Container Compilation<span class="badge">{{ compilerLogTotal }}</span></h3>
+
+                <div class="tab-content">
+                    {% if collector.compilerLogs is empty %}
+                        <div class="empty">
+                            <p>There are no compiler log messages.</p>
+                        </div>
+                    {% else %}
+                        <table class="logs">
+                            <thead>
+                                <tr>
+                                    <th class="full-width">Class</th>
+                                    <th>Messages</th>
+                                </tr>
+                            </thead>
+
+                            <tbody>
+                                {% for class, logs in collector.compilerLogs %}
+                                    <tr class="">
+                                        <td class="font-normal">
+                                            {% set context_id = 'context-compiler-' ~ loop.index %}
+
+                                             <a class="btn btn-link sf-toggle" data-toggle-selector="#{{ context_id }}" data-toggle-alt-content="{{ class }}">{{ class }}</a>
+
+                                             <div id="{{ context_id }}" class="context sf-toggle-content sf-toggle-hidden">
+                                                <ul>
+                                                {% for log in logs %}
+                                                    <li>{{ profiler_dump_log(log.message) }}</li>
+                                                {% endfor %}
+                                                </ul>
+                                            </div>
+                                        </td>
+                                        <td class="font-normal text-right">{{ logs|length }}</td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    {% endif %}
+                </div>
+            </div>
+
         </div>
     {% endif %}
 {% endblock %}
@@ -165,24 +211,24 @@
 
                     {% endif %}
 
-                    <td class="font-normal">{{ helper.render_log_message(category, loop.index, log, is_deprecation) }}</td>
+                    <td class="font-normal">{{ helper.render_log_message(category, loop.index, log) }}</td>
                 </tr>
             {% endfor %}
         </tbody>
     </table>
 {% endmacro %}
 
-{% macro render_log_message(category, log_index, log, is_deprecation = false) %}
-    {% if is_deprecation %}
-        {{ log.message }}
+{% macro render_log_message(category, log_index, log) %}
+    {% if log.context.exception.trace is defined %}
+        {{ profiler_dump_log(log.message, log.context) }}
 
         {% set context_id = 'context-' ~ category ~ '-' ~ log_index %}
 
         <span class="metadata">
              <a class="btn btn-link text-small sf-toggle" data-toggle-selector="#{{ context_id }}" data-toggle-alt-content="Hide trace">Show trace</a>
 
             <div id="{{ context_id }}" class="context sf-toggle-content sf-toggle-hidden">
-                {{ profiler_dump(log.context.exception['\0Exception\0trace'], maxDepth=2) }}
+                {{ profiler_dump(log.context.exception.trace, maxDepth=1) }}
             </div>
         </span>
     {% elseif log.context is defined and log.context is not empty %}
@@ -198,6 +244,6 @@
             </div>
         </span>
     {% else %}
-        {{ log.message }}
+        {{ profiler_dump_log(log.message) }}
     {% endif %}
 {% endmacro %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
@@ -89,18 +89,19 @@ public function dumpData(\Twig_Environment $env, Data $data, $maxDepth = 0)
         return str_replace("\n</pre", '</pre', rtrim($dump));
     }
 
-    public function dumpLog(\Twig_Environment $env, $message, Data $context)
+    public function dumpLog(\Twig_Environment $env, $message, Data $context = null)
     {
         $message = twig_escape_filter($env, $message);
+        $message = preg_replace('/&quot;(.*?)&quot;/', '&quot;<b>$1</b>&quot;', $message);
 
-        if (false === strpos($message, '{')) {
+        if (null === $context || false === strpos($message, '{')) {
             return '<span class="dump-inline">'.$message.'</span>';
         }
 
         $replacements = array();
         foreach ($context as $k => $v) {
             $k = '{'.twig_escape_filter($env, $k).'}';
-            $replacements['&quot;'.$k.'&quot;'] = $replacements[$k] = $this->dumpData($env, $v);
+            $replacements['&quot;<b>'.$k.'</b>&quot;'] = $replacements['&quot;'.$k.'&quot;'] = $replacements[$k] = $this->dumpData($env, $v);
         }
 
         return '<span class="dump-inline">'.strtr($message, $replacements).'</span>';

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
@@ -114,6 +114,10 @@ public function addLogMessage($string)
      */
     public function log(CompilerPassInterface $pass, $message)
     {
+        if (false !== strpos($message, "\n")) {
+            $message = str_replace("\n", "\n".get_class($pass).': ', trim($message));
+        }
+
         $this->log[] = get_class($pass).': '.$message;
     }
 

diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -24,12 +24,15 @@
 class LoggerDataCollector extends DataCollector implements LateDataCollectorInterface
 {
     private $logger;
+    private $containerPathPrefix;
 
-    public function __construct($logger = null)
+    public function __construct($logger = null, $containerPathPrefix = null)
     {
         if (null !== $logger && $logger instanceof DebugLoggerInterface) {
             $this->logger = $logger;
         }
+
+        $this->containerPathPrefix = $containerPathPrefix;
     }
 
     /**
@@ -47,7 +50,11 @@ public function lateCollect()
     {
         if (null !== $this->logger) {
             $this->data = $this->computeErrorsCount();
-            $this->data['logs'] = $this->sanitizeLogs($this->logger->getLogs());
+
+            $containerDeprecationLogs = $this->getContainerDeprecationLogs();
+            $this->data['deprecation_count'] += count($containerDeprecationLogs);
+            $this->data['compiler_logs'] = $this->getContainerCompilerLogs();
+            $this->data['logs'] = $this->sanitizeLogs(array_merge($this->logger->getLogs(), $containerDeprecationLogs));
             $this->data = $this->cloneVar($this->data);
         }
     }
@@ -87,6 +94,11 @@ public function countScreams()
         return isset($this->data['scream_count']) ? $this->data['scream_count'] : 0;
     }
 
+    public function getCompilerLogs()
+    {
+        return isset($this->data['compiler_logs']) ? $this->data['compiler_logs'] : array();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -95,6 +107,44 @@ public function getName()
         return 'logger';
     }
 
+    private function getContainerDeprecationLogs()
+    {
+        if (null === $this->containerPathPrefix || !file_exists($file = $this->containerPathPrefix.'Deprecations.log')) {
+            return array();
+        }
+
+        $stubs = array();
+        $bootTime = filemtime($file);
+        $logs = array();
+        foreach (unserialize(file_get_contents($file)) as $log) {
+            $log['context'] = array('exception' => new SilencedErrorContext($log['type'], $log['file'], $log['line']));
+            $log['timestamp'] = $bootTime;
+            $log['priority'] = 100;
+            $log['priorityName'] = 'DEBUG';
+            $log['channel'] = '-';
+            $log['scream'] = false;
+            $logs[] = $log;
+        }
+
+        return $logs;
+    }
+
+    private function getContainerCompilerLogs()
+    {
+        if (null === $this->containerPathPrefix || !file_exists($file = $this->containerPathPrefix.'Compiler.log')) {
+            return array();
+        }
+
+        $logs = array();
+        foreach (file($file, FILE_IGNORE_NEW_LINES) as $log) {
+            $log = explode(': ', $log, 2);
+
+            $logs[$log[0]][] = array('message' => $log[1]);
+        }
+
+        return $logs;
+    }
+
     private function sanitizeLogs($logs)
     {
         $sanitizedLogs = array();
@@ -107,7 +157,7 @@ private function sanitizeLogs($logs)
             }
 
             $exception = $log['context']['exception'];
-            $errorId = md5("{$exception->getSeverity()}/{$exception->getLine()}/{$exception->getFile()}".($exception instanceof \Exception ? "\0".$exception->getMessage() : ''), true);
+            $errorId = md5("{$exception->getSeverity()}/{$exception->getLine()}/{$exception->getFile()}\0{$log['message']}", true);
 
             if (isset($sanitizedLogs[$errorId])) {
                 ++$sanitizedLogs[$errorId]['errorCount'];

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -539,12 +539,32 @@ protected function initializeContainer()
         $cache = new ConfigCache($this->getCacheDir().'/'.$class.'.php', $this->debug);
         $fresh = true;
         if (!$cache->isFresh()) {
-            $container = $this->buildContainer();
+            if ($this->debug) {
+                $collectedLogs = array();
+                $previousHandler = set_error_handler(function ($type, $message, $file, $line) use (&$collectedLogs, &$previousHandler) {
+                    if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
+                        return $previousHandler ? $previousHandler($type, $message, $file, $line) : false;
+                    }
+
+                    $collectedLogs[] = array(
+                        'type' => $type,
+                        'message' => $message,
+                        'file' => $file,
+                        'line' => $line,
+                    );
+                });
+            }
+
             try {
+                $container = null;
+                $container = $this->buildContainer();
                 $container->compile();
             } finally {
                 if ($this->debug) {
-                    file_put_contents($this->getCacheDir().'/'.$class.'Compiler.log', implode("\n", $container->getCompiler()->getLog()));
+                    restore_error_handler();
+
+                    file_put_contents($this->getCacheDir().'/'.$class.'Deprecations.log', serialize($collectedLogs));
+                    file_put_contents($this->getCacheDir().'/'.$class.'Compiler.log', null !== $container ? implode("\n", $container->getCompiler()->getLog()) : '');
                 }
             }
             $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());