tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4412 from sminnee/4336-error-exit-code

Browse Source 
Ensure proper exit code for exceptions & errors (fixes #4336)
This commit is contained in:
Ingo Schommer 2015-07-18 11:46:13 +12:00
commit 712d796c14
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev/Debug.php
View File

@ -531,7 +531,8 @@ function exceptionHandler($exception) {
$file = $exception->getFile(); $file = $exception->getFile();
$line = $exception->getLine(); $line = $exception->getLine();
$context = $exception->getTrace(); $context = $exception->getTrace();
return Debug::fatalHandler($errno, $message, $file, $line, $context); Debug::fatalHandler($errno, $message, $file, $line, $context);
exit(1);
} }
/** /**
@ -550,7 +551,8 @@ function errorHandler($errno, $errstr, $errfile, $errline) {
case E_ERROR: case E_ERROR:
case E_CORE_ERROR: case E_CORE_ERROR:
case E_USER_ERROR: case E_USER_ERROR:
return Debug::fatalHandler($errno, $errstr, $errfile, $errline, debug_backtrace()); Debug::fatalHandler($errno, $errstr, $errfile, $errline, debug_backtrace());
exit(1);
case E_WARNING: case E_WARNING:
case E_CORE_WARNING: case E_CORE_WARNING: