Merge remote branch 'Seldaek/monolog_bundle'

* Seldaek/monolog_bundle: [MonologBundle] Added support for new Monolog log level [FrameworkBundle] Treat all log messages >=ERR as errors
berkin · May 2, 2011 · 12fb4a0 · 12fb4a0
2 parents 8746f7b + a56ea15
commit 12fb4a0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git 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 @@
 <ol class="traces">
     {% for log in logs %}
         <li>
-            {% 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 %}
                 <em>{{ log.priorityName }}</em>
             {% else %}
                 {{ log.priorityName }}

diff --git 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 @@ public function getLogs()
      */
     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
@@ -36,15 +36,19 @@
 
     <xsd:simpleType name="level">
         <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="error" />
-            <xsd:enumeration value="warning" />
-            <xsd:enumeration value="info" />
             <xsd:enumeration value="debug" />
+            <xsd:enumeration value="info" />
+            <xsd:enumeration value="warning" />
+            <xsd:enumeration value="error" />
+            <xsd:enumeration value="critical" />
+            <xsd:enumeration value="alert" />
 
             <xsd:enumeration value="100" />
             <xsd:enumeration value="200" />
             <xsd:enumeration value="300" />
             <xsd:enumeration value="400" />
+            <xsd:enumeration value="500" />
+            <xsd:enumeration value="550" />
         </xsd:restriction>
     </xsd:simpleType>
 </xsd:schema>