diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'Seldaek/monolog_bundle'

Browse Source 
* Seldaek/monolog_bundle:
  [MonologBundle] Added support for new Monolog log level
  [FrameworkBundle] Treat all log messages >=ERR as errors
This commit is contained in:
Fabien Potencier 2011-05-02 22:59:14 +02:00
commit 12fb4a0a95
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/logs.html.twig
View File

@ -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 }}

11
src/Symfony/Bundle/MonologBundle/Logger/DebugHandler.php
View File

@ -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;
}
}

10
src/Symfony/Bundle/MonologBundle/Resources/config/schema/monolog-1.0.xsd
View File

@ -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>