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

Refactoring error class.

This commit is contained in:
Taylor Otwell 2011-08-02 10:52:02 -05:00
parent fc87103205
commit 530e1292d5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
system/error.php
View File

@ -3,7 +3,7 @@
class Error { class Error {
/** /**
* Error levels and descriptions. * Human-readable error levels and descriptions.
* *
* @var array * @var array
*/ */
@ -31,6 +31,9 @@ class Error {
*/ */
public static function handle($e) public static function handle($e)
{ {
// Clear the output buffer so nothing is sent to the browser except the error
// message. This prevents any views that have already been rendered from being
// in an incomplete or erroneous state.
if (ob_get_level() > 0) if (ob_get_level() > 0)
{ {
ob_clean(); ob_clean();
@ -38,11 +41,11 @@ public static function handle($e)
$severity = (array_key_exists($e->getCode(), static::$levels)) ? static::$levels[$e->getCode()] : $e->getCode(); $severity = (array_key_exists($e->getCode(), static::$levels)) ? static::$levels[$e->getCode()] : $e->getCode();
$message = rtrim($e->getMessage(), '.'); $message = rtrim($e->getMessage(), '.').' in '.str_replace(array(APP_PATH, SYS_PATH), array('APP_PATH/', 'SYS_PATH/'), $e->getFile()).' on line '.$e->getLine().'.';
if (Config::get('error.log')) if (Config::get('error.log'))
{ {
call_user_func(Config::get('error.logger'), $severity, $message.' in '.$e->getFile().' on line '.$e->getLine()); call_user_func(Config::get('error.logger'), $severity, $message, $e->getTraceAsString());
} }
static::show($e, $severity, $message); static::show($e, $severity, $message);
@ -65,11 +68,10 @@ private static function show($e, $severity, $message)
$view = View::make('error/exception') $view = View::make('error/exception')
->bind('severity', $severity) ->bind('severity', $severity)
->bind('message', $message) ->bind('message', $message)
->bind('file', $e->getFile())
->bind('line', $e->getLine()) ->bind('line', $e->getLine())
->bind('trace', $e->getTraceAsString()) ->bind('trace', $e->getTraceAsString())
->bind('contexts', static::context($e->getFile(), $e->getLine())); ->bind('contexts', static::context($e->getFile(), $e->getLine()));
Response::make($view, 500)->send(); Response::make($view, 500)->send();
} }
else else
@ -94,15 +96,9 @@ private static function context($path, $line, $padding = 5)
array_unshift($file, ''); array_unshift($file, '');
if (($start = $line - $padding) < 0) if (($start = $line - $padding) < 0) $start = 0;
{
$start = 0;
}
if (($length = ($line - $start) + $padding + 1) < 0) if (($length = ($line - $start) + $padding + 1) < 0) $length = 0;
{
$length = 0;
}
return array_slice($file, $start, $length, true); return array_slice($file, $start, $length, true);
} }