beu/TrackManiaControl
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

improved fatal error recognition

Browse Source
This commit is contained in:
Steffen Schröder
2014-06-20 00:05:50 +02:00
parent d229581946
commit 9b2c876d1a
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/ManiaControl.php
View File

@@ -11,9 +11,6 @@ define('LOG_NAME_USE_PID', true); // Use current process id as suffix for log fi
// Define base dir // Define base dir
define('ManiaControlDir', __DIR__ . DIRECTORY_SEPARATOR); define('ManiaControlDir', __DIR__ . DIRECTORY_SEPARATOR);
// Define fatal error level
define('E_FATAL', E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_RECOVERABLE_ERROR | E_USER_ERROR);
// Min PHP Version // Min PHP Version
define('MIN_PHP_VERSION', '5.4'); define('MIN_PHP_VERSION', '5.4');

46
application/core/ErrorHandler.php
View File

@@ -69,7 +69,8 @@ class ErrorHandler {
* @param bool $onShutdown * @param bool $onShutdown
* @return bool * @return bool
*/ */
public function handleError($errorNumber, $errorString, $errorFile = null, $errorLine = -1, array $errorContext = array(), $onShutdown = false) { public function handleError($errorNumber, $errorString, $errorFile = null, $errorLine = -1, array $errorContext = array(),
$onShutdown = false) {
$suppressed = (error_reporting() === 0); $suppressed = (error_reporting() === 0);
if ($suppressed && !self::LOG_SUPPRESSED_ERRORS) { if ($suppressed && !self::LOG_SUPPRESSED_ERRORS) {
return false; return false;
@@ -150,7 +151,7 @@ class ErrorHandler {
} }
} }
if ($this->isFatalError($errorNumber)) { if (self::isFatalError($errorNumber)) {
$this->maniaControl->quit('Quitting ManiaControl after Fatal Error.'); $this->maniaControl->quit('Quitting ManiaControl after Fatal Error.');
} }
@@ -168,24 +169,26 @@ class ErrorHandler {
*/ */
public function getErrorTag($errorLevel) { public function getErrorTag($errorLevel) {
switch ($errorLevel) { switch ($errorLevel) {
case E_NOTICE:
return '[PHP NOTICE]';
case E_WARNING:
return '[PHP WARNING]';
case E_ERROR: case E_ERROR:
return '[PHP ERROR]'; return '[PHP ERROR]';
case E_WARNING:
return '[PHP WARNING]';
case E_PARSE:
return '[PHP PARSE ERROR]';
case E_NOTICE:
return '[PHP NOTICE]';
case E_CORE_ERROR: case E_CORE_ERROR:
return '[PHP CORE ERROR]'; return '[PHP CORE ERROR]';
case E_COMPILE_ERROR: case E_COMPILE_ERROR:
return '[PHP COMPILE ERROR]'; return '[PHP COMPILE ERROR]';
case E_RECOVERABLE_ERROR:
return '[PHP RECOVERABLE ERROR]';
case E_USER_NOTICE:
return '[ManiaControl NOTICE]';
case E_USER_WARNING:
return '[ManiaControl WARNING]';
case E_USER_ERROR: case E_USER_ERROR:
return '[ManiaControl ERROR]'; return '[ManiaControl ERROR]';
case E_USER_WARNING:
return '[ManiaControl WARNING]';
case E_USER_NOTICE:
return '[ManiaControl NOTICE]';
case E_RECOVERABLE_ERROR:
return '[PHP RECOVERABLE ERROR]';
case self::MC_DEBUG_NOTICE: case self::MC_DEBUG_NOTICE:
return '[ManiaControl DEBUG]'; return '[ManiaControl DEBUG]';
} }
@@ -199,7 +202,8 @@ class ErrorHandler {
* @return bool * @return bool
*/ */
private function isUserErrorNumber($errorNumber) { private function isUserErrorNumber($errorNumber) {
return ($errorNumber & E_USER_ERROR || $errorNumber & E_USER_WARNING || $errorNumber & E_USER_NOTICE || $errorNumber & E_USER_DEPRECATED); return ($errorNumber & E_USER_ERROR || $errorNumber & E_USER_WARNING || $errorNumber & E_USER_NOTICE
|| $errorNumber & E_USER_DEPRECATED);
} }
/** /**
@@ -283,8 +287,13 @@ class ErrorHandler {
* @return bool * @return bool
*/ */
private function isIgnoredSourceClass($class) { private function isIgnoredSourceClass($class) {
return (!$class || strpos($class, '\\FaultException') !== false || strpos($class, '\\ErrorHandler') !== false); $ignoredClasses = array('\\ErrorHandler', '\\FaultException');
foreach ($ignoredClasses as $ignoredClass) {
if (strpos($class, $ignoredClass) !== false) {
return true;
}
}
return false;
} }
/** /**
@@ -354,8 +363,9 @@ class ErrorHandler {
* @param int $errorNumber * @param int $errorNumber
* @return bool * @return bool
*/ */
private function isFatalError($errorNumber) { public static function isFatalError($errorNumber) {
return ($errorNumber & E_FATAL); $fatalError = (E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR);
return ($errorNumber & $fatalError);
} }
/** /**
@@ -384,7 +394,7 @@ class ErrorHandler {
// Check if the Shutdown was caused by a Fatal Error and report it // Check if the Shutdown was caused by a Fatal Error and report it
$error = error_get_last(); $error = error_get_last();
if ($error && ($error['type'] & E_FATAL)) { if ($error && self::isFatalError($error['type'])) {
$this->handleError($error['type'], $error['message'], $error['file'], $error['line'], array(), true); $this->handleError($error['type'], $error['message'], $error['file'], $error['line'], array(), true);
} }