diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpKernel] Cleanup ExceptionListener

This commit is contained in:
Nicolas Grekas 2015-04-16 10:51:32 +02:00
parent 942f7f2fd1
commit d97279e942
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
View File

@ -38,14 +38,6 @@ class ExceptionListener implements EventSubscriberInterface
public function onKernelException(GetResponseForExceptionEvent $event)
{
static $handling;
if (true === $handling) {
return false;
}
$handling = true;
$exception = $event->getException();
$request = $event->getRequest();
@ -65,13 +57,10 @@ class ExceptionListener implements EventSubscriberInterface
$request->setMethod('GET');
try {
$response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, true);
$response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, false);
} catch (\Exception $e) {
$this->logException($e, sprintf('Exception thrown when handling an exception (%s: %s at %s line %s)', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()), false);
// set handling to false otherwise it wont be able to handle further more
$handling = false;
$wrapper = $e;
while ($prev = $wrapper->getPrevious()) {
@ -88,8 +77,6 @@ class ExceptionListener implements EventSubscriberInterface
}
$event->setResponse($response);
$handling = false;
}
public static function getSubscribedEvents()