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

Fix handling of messages with new lines

Browse Source
This commit is contained in:
Jordi Boggiano
2016-04-12 19:17:42 +01:00
parent 0e3a4bf48b
commit f56f2969f7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Monolog/Handler/DeduplicationHandler.php
View File

@@ -114,12 +114,12 @@ class DeduplicationHandler extends BufferHandler
$yesterday = time() - 86400; $yesterday = time() - 86400;
$timestampValidity = $record['datetime']->getTimestamp() - $this->time; $timestampValidity = $record['datetime']->getTimestamp() - $this->time;
$line = $record['level_name'] . ':' . $record['message']; $expectedMessage = preg_replace('{[\r\n].*}', '', $record['message']);
for ($i = count($store) - 1; $i >= 0; $i--) { for ($i = count($store) - 1; $i >= 0; $i--) {
list($timestamp, $level, $message) = explode(':', $store[$i], 3); list($timestamp, $level, $message) = explode(':', $store[$i], 3);
if ($level === $record['level_name'] && $message === $record['message'] && $timestamp > $timestampValidity) { if ($level === $record['level_name'] && $message === $expectedMessage && $timestamp > $timestampValidity) {
return true; return true;
} }
@@ -164,6 +164,6 @@ class DeduplicationHandler extends BufferHandler
private function appendRecord(array $record) private function appendRecord(array $record)
{ {
file_put_contents($this->deduplicationStore, $record['datetime']->getTimestamp() . ':' . $record['level_name'] . ':' . $record['message'] . "\n", FILE_APPEND); file_put_contents($this->deduplicationStore, $record['datetime']->getTimestamp() . ':' . $record['level_name'] . ':' . preg_replace('{[\r\n].*}', '', $record['message']) . "\n", FILE_APPEND);
} }
} }

4
tests/Monolog/Handler/DeduplicationHandlerTest.php
View File

@@ -46,7 +46,7 @@ class DeduplicationHandlerTest extends TestCase
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0); $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
$handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar')); $handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar'));
$handler->handle($this->getRecord(Logger::CRITICAL)); $handler->handle($this->getRecord(Logger::CRITICAL, "Foo\nbar"));
$handler->flush(); $handler->flush();
@@ -67,7 +67,7 @@ class DeduplicationHandlerTest extends TestCase
$handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0); $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
$handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar')); $handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar'));
$handler->handle($this->getRecord(Logger::CRITICAL)); $handler->handle($this->getRecord(Logger::CRITICAL, "Foo\nbar"));
$handler->flush(); $handler->flush();