Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-21 18:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added StreamLoggerTest

Browse source
This commit is contained in:
Philipp Holzer 2019-03-03 21:25:18 +01:00 • committed by Hypolite Petovan
parent 81ba5376d0
commit 7658916540
2 changed files with 223 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Util/Logger/StreamLogger.php
View file

@ -35,6 +35,12 @@ class StreamLogger extends AbstractFriendicaLogger
*/
private $pid;
/**
* An error message
* @var string
*/
private $errorMessage;
/**
* Translates LogLevel log levels to integer values
* @var array
@ -98,7 +104,7 @@ class StreamLogger extends AbstractFriendicaLogger
protected function addEntry($level, $message, $context = [])
{
if (!array_key_exists($level, $this->levelToInt)) {
throw new \InvalidArgumentException('The level "%s" is not valid', $level);
throw new \InvalidArgumentException(sprintf('The level "%s" is not valid.', $level));
}
$logLevel = $this->levelToInt[$level];
@ -151,12 +157,14 @@ class StreamLogger extends AbstractFriendicaLogger
}
$this->createDir();
$this->stream = fopen($this->url, 'a');
set_error_handler([$this, 'customErrorHandler']);
$this->stream = fopen($this->url, 'ab');
restore_error_handler();
if (!is_resource($this->stream)) {
$this->stream = null;
throw new \UnexpectedValueException(sprintf('The stream or file "%s" could not be opened.', $this->url));
throw new \UnexpectedValueException(sprintf('The stream or file "%s" could not be opened: ' . $this->errorMessage, $this->url));
}
}
@ -173,10 +181,18 @@ class StreamLogger extends AbstractFriendicaLogger
}
if (isset($dirname) && !is_dir($dirname)) {
set_error_handler([$this, 'customErrorHandler']);
$status = mkdir($dirname, 0777, true);
restore_error_handler();
if (!$status && !is_dir($dirname)) {
throw new \UnexpectedValueException(sprintf('Directory "%s" cannot get created.', $dirname));
throw new \UnexpectedValueException(sprintf('Directory "%s" cannot get created: ' . $this->errorMessage, $dirname));
}
}
}
private function customErrorHandler($code, $msg)
{
$this->errorMessage = preg_replace('{^(fopen|mkdir)\(.*?\): }', '', $msg);
}
}