Skip to content

S
syncEnrollments
Commit 24ba947d authored by Matthew Machuga's avatar Matthew Machuga
Browse files
Options

Add 500 response code to exception handler. -- machuga, JesseOBrien, sdeinum

parent d693a826
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 8 deletions
laravel/error.php
View file @ 24ba947d
...@@ -30,20 +30,23 @@ class Error { ...@@ -30,20 +30,23 @@ class Error {
// 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 @@ class Error { ...@@ -53,9 +56,13 @@ class Error {
{ {
$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);
} }
...@@ -119,4 +126,4 @@ class Error { ...@@ -119,4 +126,4 @@ class Error {
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment