mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-19 11:21:27 +02:00
Code Issues Releases Wiki Activity

Moved the channel as label on the FirePHP message for a better formatting

Browse Source
This commit is contained in:
Christophe Coevoet
2011-06-01 00:43:09 +02:00
parent c1675c59d8
commit e9f3e0c2d7
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Monolog/Formatter/WildfireFormatter.php
View File

@@ -23,7 +23,7 @@ class WildfireFormatter extends LineFormatter
/** /**
* Similar to LineFormatter::SIMPLE_FORMAT, except without the "[%datetime%]" * 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. * Translates Monolog log levels to Wildfire levels.
@@ -51,6 +51,7 @@ class WildfireFormatter extends LineFormatter
'Type' => $this->logLevels[$record['level']], 'Type' => $this->logLevels[$record['level']],
'File' => '', 'File' => '',
'Line' => '', 'Line' => '',
'Label' => $record['channel'],
), ),
$message, $message,
)); ));

2
tests/Monolog/Formatter/WildfireFormatterTest.php
View File

@@ -31,7 +31,7 @@ class WildfireFormatterTest extends \PHPUnit_Framework_TestCase
$message = $wildfire->format($record); $message = $wildfire->format($record);
$this->assertEquals( $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 $message
); );
} }

12
tests/Monolog/Handler/FirePHPHandlerTest.php
View File

@@ -31,8 +31,8 @@ class FirePHPHandlerTest extends TestCase
'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2', '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-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-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-1' => '64|[{"Type":"LOG","File":"","Line":"","Label":"test"},"test [] []"]|',
'X-Wf-1-1-1-2' => '56|[{"Type":"WARN","File":"","Line":""},"test: test [] []"]|', 'X-Wf-1-1-1-2' => '65|[{"Type":"WARN","File":"","Line":"","Label":"test"},"test [] []"]|',
); );
$this->assertEquals($expected, $handler->getHeaders()); $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-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-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-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-1' => '64|[{"Type":"LOG","File":"","Line":"","Label":"test"},"test [] []"]|',
'X-Wf-1-1-1-2' => '56|[{"Type":"WARN","File":"","Line":""},"test: test [] []"]|', 'X-Wf-1-1-1-2' => '65|[{"Type":"WARN","File":"","Line":"","Label":"test"},"test [] []"]|',
); );
$expected2 = array( $expected2 = array(
'X-Wf-1-1-1-3' => '55|[{"Type":"LOG","File":"","Line":""},"test: test [] []"]|', 'X-Wf-1-1-1-3' => '64|[{"Type":"LOG","File":"","Line":"","Label":"test"},"test [] []"]|',
'X-Wf-1-1-1-4' => '56|[{"Type":"WARN","File":"","Line":""},"test: test [] []"]|', 'X-Wf-1-1-1-4' => '65|[{"Type":"WARN","File":"","Line":"","Label":"test"},"test [] []"]|',
); );
$this->assertEquals($expected, $handler->getHeaders()); $this->assertEquals($expected, $handler->getHeaders());