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

Fix bug when messages contain colons

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

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

@@ -117,7 +117,7 @@ class DeduplicationHandler extends BufferHandler
$line = $record['level_name'] . ':' . $record['message']; $line = $record['level_name'] . ':' . $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]); list($timestamp, $level, $message) = explode(':', $store[$i], 3);
if ($level === $record['level_name'] && $message === $record['message'] && $timestamp > $timestampValidity) { if ($level === $record['level_name'] && $message === $record['message'] && $timestamp > $timestampValidity) {
return true; return true;

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

@@ -45,7 +45,7 @@ class DeduplicationHandlerTest extends TestCase
@unlink(sys_get_temp_dir().'/monolog_dedup.log'); @unlink(sys_get_temp_dir().'/monolog_dedup.log');
$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)); $handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar'));
$handler->handle($this->getRecord(Logger::CRITICAL)); $handler->handle($this->getRecord(Logger::CRITICAL));
$handler->flush(); $handler->flush();
@@ -66,7 +66,7 @@ class DeduplicationHandlerTest extends TestCase
$test = new TestHandler(); $test = new TestHandler();
$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)); $handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar'));
$handler->handle($this->getRecord(Logger::CRITICAL)); $handler->handle($this->getRecord(Logger::CRITICAL));
$handler->flush(); $handler->flush();