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

Ensure private error handler does not cause problems, fixes #1866

Browse Source
This commit is contained in:
Jordi Boggiano
2024-04-15 10:17:33 +02:00
parent a30bfe2e14
commit 233e0b27a0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,9 @@ class StreamHandler extends AbstractProcessingHandler
} }
$this->createDir($url); $this->createDir($url);
$this->errorMessage = null; $this->errorMessage = null;
set_error_handler([$this, 'customErrorHandler']); set_error_handler(function (...$args) {
return $this->customErrorHandler(...$args);
});
try { try {
$stream = fopen($url, 'a'); $stream = fopen($url, 'a');
if ($this->filePermission !== null) { if ($this->filePermission !== null) {
@@ -212,7 +214,9 @@ class StreamHandler extends AbstractProcessingHandler
$dir = $this->getDirFromStream($url); $dir = $this->getDirFromStream($url);
if (null !== $dir && !is_dir($dir)) { if (null !== $dir && !is_dir($dir)) {
$this->errorMessage = null; $this->errorMessage = null;
set_error_handler([$this, 'customErrorHandler']); set_error_handler(function (...$args) {
return $this->customErrorHandler(...$args);
});
$status = mkdir($dir, 0777, true); $status = mkdir($dir, 0777, true);
restore_error_handler(); restore_error_handler();
if (false === $status && !is_dir($dir) && strpos((string) $this->errorMessage, 'File exists') === false) { if (false === $status && !is_dir($dir) && strpos((string) $this->errorMessage, 'File exists') === false) {