Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #157 from sparksp/develop/exception 

Refactor error handling to log ignored errors
This commit is contained in:
Taylor Otwell 2011-11-16 08:40:22 -08:00
parent d3f9391981 1d5fbab515
commit beb44eb429
1 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
laravel/laravel.php
View File

@ -14,23 +14,30 @@
*/ */
date_default_timezone_set(Config::$items['application']['timezone']); date_default_timezone_set(Config::$items['application']['timezone']);
/**
* Create the exception logging function. All of the error logging
* is routed through here to avoid duplicate code. This Closure
* will determine if the actual logging Closure should be called.
*/
$logger = function($exception)
{
if (Config::$items['error']['log'])
{
call_user_func(Config::$items['error']['logger'], $exception);
}
};
/** /**
* Create the exception handler function. All of the error handlers * Create the exception handler function. All of the error handlers
* registered by the framework call this closure to avoid duplicate * registered by the framework call this closure to avoid duplicate
* code. This Closure will determine if the logging Closure should * code. This Closure will pass the exception to the developer
* be called, and will pass the exception to the developer defined * defined handler in the configuration file.
* handler in the configuration file.
*/ */
$handler = function($exception) $handler = function($exception) use ($logger)
{ {
$config = Config::$items['error']; $logger($exception);
if ($config['log']) if (Config::$items['error']['detail'])
{
call_user_func($config['logger'], $exception);
}
if ($config['detail'])
{ {
echo "<html><h2>Unhandled Exception</h2> echo "<html><h2>Unhandled Exception</h2>
<h3>Message:</h3> <h3>Message:</h3>
@ -55,22 +62,29 @@
*/ */
set_exception_handler(function($exception) use ($handler) set_exception_handler(function($exception) use ($handler)
{ {
$handler($exception); $handler($exception);
}); });
/** /**
* Register the PHP error handler. All PHP errors will fall into this * Register the PHP error handler. All PHP errors will fall into this
* handler, which will convert the error into an ErrorException object * handler, which will convert the error into an ErrorException object
* and pass the exception into the common exception handler. * and pass the exception into the common exception handler. Suppressed
* errors are ignored and errors in the developer configured whitelist
* are silently logged.
*/ */
set_error_handler(function($number, $error, $file, $line) set_error_handler(function($number, $error, $file, $line) use ($logger)
{ {
if (error_reporting() === 0 or in_array($number, Config::$items['error']['ignore'])) if (error_reporting() === 0)
{ {
return; return;
} }
$exception = new \ErrorException($error, $number, 0, $file, $line);
throw new \ErrorException($error, $number, 0, $file, $line); if (in_array($number, Config::$items['error']['ignore']))
{
$logger($exception);
return;
}
throw $exception;
}); });
/** /**
@ -221,4 +235,4 @@
IoC::core('session')->save($driver); IoC::core('session')->save($driver);
} }
$response->send(); $response->send();