mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-11 15:44:34 +02:00
Code Issues Releases Wiki Activity

Fix feedback

Browse Source
This commit is contained in:
Jordi Boggiano
2013-07-28 20:35:20 +02:00
parent fdd45cc6bc
commit cb47b537f3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Monolog/ErrorHandler.php
View File

@@ -75,12 +75,12 @@ class ErrorHandler
} }
} }
public function registerErrorHandler($levelMap = array(), $callPrevious = true, $errorTypes = -1) public function registerErrorHandler(array $levelMap = array(), $callPrevious = true, $errorTypes = -1)
{ {
$prev = set_error_handler(array($this, 'handleError'), $errorTypes); $prev = set_error_handler(array($this, 'handleError'), $errorTypes);
$this->errorLevelMap = array_merge($this->defaultErrorLevelMap(), $levelMap); $this->errorLevelMap = array_merge($this->defaultErrorLevelMap(), $levelMap);
if ($callPrevious && $prev) { if ($callPrevious) {
$this->previousErrorHandler = $prev; $this->previousErrorHandler = $prev ?: true;
} }
} }
@@ -89,7 +89,7 @@ class ErrorHandler
register_shutdown_function(array($this, 'handleFatalError')); register_shutdown_function(array($this, 'handleFatalError'));
$this->reservedMemory = str_repeat(' ', 1024 * $reservedMemorySize); $this->reservedMemory = str_repeat(' ', 1024 * $reservedMemorySize);
$this->fatalLevel = $level === null ? Logger::CRITICAL : $level; $this->fatalLevel = $level === null ? Logger::ALERT : $level;
} }
protected function defaultErrorLevelMap() protected function defaultErrorLevelMap()
@@ -137,7 +137,9 @@ class ErrorHandler
$level = isset($this->errorLevelMap[$code]) ? $this->errorLevelMap[$code] : Logger::CRITICAL; $level = isset($this->errorLevelMap[$code]) ? $this->errorLevelMap[$code] : Logger::CRITICAL;
$this->logger->log($level, self::codeToString($code).': '.$message, array('file' => $file, 'line' => $line)); $this->logger->log($level, self::codeToString($code).': '.$message, array('file' => $file, 'line' => $line));
if ($this->previousErrorHandler) { if ($this->previousErrorHandler === true) {
return false;
} elseif ($this->previousErrorHandler) {
return call_user_func($this->previousErrorHandler, $code, $message, $file, $line, $context); return call_user_func($this->previousErrorHandler, $code, $message, $file, $line, $context);
} }
} }