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

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2019-07-02 15:55:14 +02:00
parent 869e627caa ab7e54e7df
commit 10bfeb8bcd
5 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Monolog/Handler/GroupHandler.php
View File

@@ -81,8 +81,9 @@ class GroupHandler extends Handler implements ProcessableHandlerInterface, Reset
$processed = []; $processed = [];
foreach ($records as $record) { foreach ($records as $record) {
foreach ($this->processors as $processor) { foreach ($this->processors as $processor) {
$processed[] = call_user_func($processor, $record); $record = call_user_func($processor, $record);
} }
$processed[] = $record;
} }
$records = $processed; $records = $processed;
} }

1
src/Monolog/Handler/StreamHandler.php
View File

@@ -65,6 +65,7 @@ class StreamHandler extends AbstractProcessingHandler
fclose($this->stream); fclose($this->stream);
} }
$this->stream = null; $this->stream = null;
$this->dirCreated = null;
} }
/** /**

3
src/Monolog/Handler/WhatFailureGroupHandler.php
View File

@@ -50,8 +50,9 @@ class WhatFailureGroupHandler extends GroupHandler
$processed = array(); $processed = array();
foreach ($records as $record) { foreach ($records as $record) {
foreach ($this->processors as $processor) { foreach ($this->processors as $processor) {
$processed[] = call_user_func($processor, $record); $record = call_user_func($processor, $record);
} }
$processed[] = $record;
} }
$records = $processed; $records = $processed;
} }

7
tests/Monolog/Handler/GroupHandlerTest.php
View File

@@ -99,6 +99,11 @@ class GroupHandlerTest extends TestCase
return $record; return $record;
}); });
$handler->pushProcessor(function ($record) {
$record['extra']['foo2'] = true;
return $record;
});
$handler->handleBatch([$this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)]); $handler->handleBatch([$this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)]);
foreach ($testHandlers as $test) { foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords()); $this->assertTrue($test->hasDebugRecords());
@@ -107,6 +112,8 @@ class GroupHandlerTest extends TestCase
$records = $test->getRecords(); $records = $test->getRecords();
$this->assertTrue($records[0]['extra']['foo']); $this->assertTrue($records[0]['extra']['foo']);
$this->assertTrue($records[1]['extra']['foo']); $this->assertTrue($records[1]['extra']['foo']);
$this->assertTrue($records[0]['extra']['foo2']);
$this->assertTrue($records[1]['extra']['foo2']);
} }
} }
} }

7
tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
View File

@@ -99,6 +99,11 @@ class WhatFailureGroupHandlerTest extends TestCase
return $record; return $record;
}); });
$handler->pushProcessor(function ($record) {
$record['extra']['foo2'] = true;
return $record;
});
$handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO))); $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)));
foreach ($testHandlers as $test) { foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords()); $this->assertTrue($test->hasDebugRecords());
@@ -107,6 +112,8 @@ class WhatFailureGroupHandlerTest extends TestCase
$records = $test->getRecords(); $records = $test->getRecords();
$this->assertTrue($records[0]['extra']['foo']); $this->assertTrue($records[0]['extra']['foo']);
$this->assertTrue($records[1]['extra']['foo']); $this->assertTrue($records[1]['extra']['foo']);
$this->assertTrue($records[0]['extra']['foo2']);
$this->assertTrue($records[1]['extra']['foo2']);
} }
} }