From e9f3e0c2d70ea39a2883599561f4c9160690f78f Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Wed, 1 Jun 2011 00:43:09 +0200 Subject: [PATCH] Moved the channel as label on the FirePHP message for a better formatting --- src/Monolog/Formatter/WildfireFormatter.php | 3 ++- tests/Monolog/Formatter/WildfireFormatterTest.php | 2 +- tests/Monolog/Handler/FirePHPHandlerTest.php | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Monolog/Formatter/WildfireFormatter.php b/src/Monolog/Formatter/WildfireFormatter.php index 100db44a..85f57949 100644 --- a/src/Monolog/Formatter/WildfireFormatter.php +++ b/src/Monolog/Formatter/WildfireFormatter.php @@ -23,7 +23,7 @@ class WildfireFormatter extends LineFormatter /** * Similar to LineFormatter::SIMPLE_FORMAT, except without the "[%datetime%]" */ - const SIMPLE_FORMAT = "%channel%: %message% %context% %extra%"; + const SIMPLE_FORMAT = "%message% %context% %extra%"; /** * Translates Monolog log levels to Wildfire levels. @@ -51,6 +51,7 @@ class WildfireFormatter extends LineFormatter 'Type' => $this->logLevels[$record['level']], 'File' => '', 'Line' => '', + 'Label' => $record['channel'], ), $message, )); diff --git a/tests/Monolog/Formatter/WildfireFormatterTest.php b/tests/Monolog/Formatter/WildfireFormatterTest.php index aabd3248..9a0309ea 100644 --- a/tests/Monolog/Formatter/WildfireFormatterTest.php +++ b/tests/Monolog/Formatter/WildfireFormatterTest.php @@ -31,7 +31,7 @@ class WildfireFormatterTest extends \PHPUnit_Framework_TestCase $message = $wildfire->format($record); $this->assertEquals( - '75|[{"Type":"ERROR","File":"","Line":""},"meh: log [] {\\"ip\\":\\"127.0.0.1\\"}"]|', + '84|[{"Type":"ERROR","File":"","Line":"","Label":"meh"},"log [] {\\"ip\\":\\"127.0.0.1\\"}"]|', $message ); } diff --git a/tests/Monolog/Handler/FirePHPHandlerTest.php b/tests/Monolog/Handler/FirePHPHandlerTest.php index 1da9279e..dca97497 100644 --- a/tests/Monolog/Handler/FirePHPHandlerTest.php +++ b/tests/Monolog/Handler/FirePHPHandlerTest.php @@ -31,8 +31,8 @@ class FirePHPHandlerTest extends TestCase 'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2', 'X-Wf-1-Structure-1' => 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1', 'X-Wf-1-Plugin-1' => 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3', - 'X-Wf-1-1-1-1' => '55|[{"Type":"LOG","File":"","Line":""},"test: test [] []"]|', - 'X-Wf-1-1-1-2' => '56|[{"Type":"WARN","File":"","Line":""},"test: test [] []"]|', + 'X-Wf-1-1-1-1' => '64|[{"Type":"LOG","File":"","Line":"","Label":"test"},"test [] []"]|', + 'X-Wf-1-1-1-2' => '65|[{"Type":"WARN","File":"","Line":"","Label":"test"},"test [] []"]|', ); $this->assertEquals($expected, $handler->getHeaders()); @@ -52,13 +52,13 @@ class FirePHPHandlerTest extends TestCase 'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2', 'X-Wf-1-Structure-1' => 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1', 'X-Wf-1-Plugin-1' => 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3', - 'X-Wf-1-1-1-1' => '55|[{"Type":"LOG","File":"","Line":""},"test: test [] []"]|', - 'X-Wf-1-1-1-2' => '56|[{"Type":"WARN","File":"","Line":""},"test: test [] []"]|', + 'X-Wf-1-1-1-1' => '64|[{"Type":"LOG","File":"","Line":"","Label":"test"},"test [] []"]|', + 'X-Wf-1-1-1-2' => '65|[{"Type":"WARN","File":"","Line":"","Label":"test"},"test [] []"]|', ); $expected2 = array( - 'X-Wf-1-1-1-3' => '55|[{"Type":"LOG","File":"","Line":""},"test: test [] []"]|', - 'X-Wf-1-1-1-4' => '56|[{"Type":"WARN","File":"","Line":""},"test: test [] []"]|', + 'X-Wf-1-1-1-3' => '64|[{"Type":"LOG","File":"","Line":"","Label":"test"},"test [] []"]|', + 'X-Wf-1-1-1-4' => '65|[{"Type":"WARN","File":"","Line":"","Label":"test"},"test [] []"]|', ); $this->assertEquals($expected, $handler->getHeaders());