mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-07-30 18:00:17 +02:00
Code Issues Releases Wiki Activity

Use json_encode for the whole message formatting, refs #686

Browse Source
This commit is contained in:
Jordi Boggiano
2015-11-18 17:11:02 +00:00
parent c889fb2648
commit 665453d06a
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Monolog/Formatter/FluentdFormatter.php
View File

@@ -70,13 +70,7 @@ class FluentdFormatter implements FormatterInterface
$message['level_name'] = $record['level_name']; $message['level_name'] = $record['level_name'];
} }
return '[' return json_encode(array($tag, $record['datetime']->getTimestamp(), $message));
. '"' . $tag . '"'
. ', '
. $record['datetime']->getTimestamp()
. ', '
. json_encode($message)
. ']';
} }
public function formatBatch(array $records) public function formatBatch(array $records)

10
tests/Monolog/Formatter/FluentdFormatterTest.php
View File

@@ -40,8 +40,9 @@ class FluentdFormatterTest extends TestCase
$formatter = new FluentdFormatter(); $formatter = new FluentdFormatter();
$this->assertEquals( $this->assertEquals(
'["test", 0, {"message":"test","extra":[],"level":300,"level_name":"WARNING"}]', '["test",0,{"message":"test","extra":[],"level":300,"level_name":"WARNING"}]',
$formatter->format($record)); $formatter->format($record)
);
} }
/** /**
@@ -54,7 +55,8 @@ class FluentdFormatterTest extends TestCase
$formatter = new FluentdFormatter(true); $formatter = new FluentdFormatter(true);
$this->assertEquals( $this->assertEquals(
'["test.error", 0, {"message":"test","extra":[]}]', '["test.error",0,{"message":"test","extra":[]}]',
$formatter->format($record)); $formatter->format($record)
);
} }
} }