diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/logs.html.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/logs.html.twig index c26f030d38..874d0316c6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/logs.html.twig +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/logs.html.twig @@ -1,7 +1,8 @@
    {% for log in logs %}
  1. - {% if 'ERR' == log.priorityName %} + {% if 'EMERG' == log.priorityName or 'ERR' == log.priorityName or 'CRIT' == log.priorityName + or 'ALERT' == log.priorityName or 'ERROR' == log.priorityName or 'CRITICAL' == log.priorityName %} {{ log.priorityName }} {% else %} {{ log.priorityName }} diff --git a/src/Symfony/Bundle/MonologBundle/Logger/DebugHandler.php b/src/Symfony/Bundle/MonologBundle/Logger/DebugHandler.php index 912823789a..a26ef16ef2 100644 --- a/src/Symfony/Bundle/MonologBundle/Logger/DebugHandler.php +++ b/src/Symfony/Bundle/MonologBundle/Logger/DebugHandler.php @@ -11,6 +11,7 @@ namespace Symfony\Bundle\MonologBundle\Logger; +use Monolog\Logger; use Monolog\Handler\TestHandler; use Symfony\Component\HttpKernel\Log\DebugLoggerInterface; @@ -43,8 +44,12 @@ class DebugHandler extends TestHandler implements DebugLoggerInterface */ public function countErrors() { - return isset($this->recordsByLevel[\Monolog\Logger::ERROR]) - ? count($this->recordsByLevel[\Monolog\Logger::ERROR]) - : 0; + $cnt = 0; + foreach (array(Logger::ERROR, Logger::CRITICAL, Logger::ALERT) as $level) { + if (isset($this->recordsByLevel[$level])) { + $cnt += count($this->recordsByLevel[$level]) + } + } + return $cnt; } } diff --git a/src/Symfony/Bundle/MonologBundle/Resources/config/schema/monolog-1.0.xsd b/src/Symfony/Bundle/MonologBundle/Resources/config/schema/monolog-1.0.xsd index 8f61e3d39c..29d4ba1897 100644 --- a/src/Symfony/Bundle/MonologBundle/Resources/config/schema/monolog-1.0.xsd +++ b/src/Symfony/Bundle/MonologBundle/Resources/config/schema/monolog-1.0.xsd @@ -36,15 +36,19 @@ - - - + + + + + + +