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

Merge pull request #1413 from machuga/develop 

Add 500 response code to exception handler. -- machuga, JesseOBrien, sde...
This commit is contained in:
Taylor Otwell 2012-11-02 19:09:11 -07:00
parent d693a82615 24ba947d10
commit 5059ced2e1
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
laravel/error.php
View File

@ -30,20 +30,23 @@ public static function exception($exception, $trace = true)
// If detailed errors are enabled, we'll just format the exception into // If detailed errors are enabled, we'll just format the exception into
// a simple error message and display it on the screen. We don't use a // a simple error message and display it on the screen. We don't use a
// View in case the problem is in the View class. // View in case the problem is in the View class.
if (Config::get('error.detail')) if (Config::get('error.detail'))
{ {
echo "<html><h2>Unhandled Exception</h2> $response_body = "<html><h2>Unhandled Exception</h2>
<h3>Message:</h3> <h3>Message:</h3>
<pre>".$message."</pre> <pre>".$message."</pre>
<h3>Location:</h3> <h3>Location:</h3>
<pre>".$file." on line ".$exception->getLine()."</pre>"; <pre>".$file." on line ".$exception->getLine()."</pre>";
if ($trace) if ($trace)
{ {
echo " $response_body .= "
<h3>Stack Trace:</h3> <h3>Stack Trace:</h3>
<pre>".$exception->getTraceAsString()."</pre></html>"; <pre>".$exception->getTraceAsString()."</pre></html>";
} }
$response = Response::make($response_body, 500);
} }
// If we're not using detailed error messages, we'll use the event // If we're not using detailed error messages, we'll use the event
@ -53,9 +56,13 @@ public static function exception($exception, $trace = true)
{ {
$response = Event::first('500'); $response = Event::first('500');
echo Response::prepare($response)->render(); $response = Response::prepare($response);
} }
$response->render();
$response->send();
$response->foundation->finish();
exit(1); exit(1);
} }