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

merged branch vicb/profiler/listener_2.0 (PR #3935)

Browse Source 
Commits
-------

01fcb08 [HttpKernel] Fix the ProfilerListener (fix #3620)

Discussion
----------

[HttpKernel] Fix the ProfilerListener (fix #3620)

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/vicb/symfony.png?branch=profiler/listener_2.0)](http://travis-ci.org/vicb/symfony)
Fixes the following tickets: #3620, PR #3618

Many thanks to @guilhermeblanco for helping with the tests.

---------------------------------------------------------------------------

by vicb at 2012-04-13T20:10:15Z

For ref: that's basically a backport of #3920 for 2.0
This commit is contained in:
Fabien Potencier 2012-04-13 22:16:12 +02:00
commit 098b934410
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
View File

@ -15,6 +15,7 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent; use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\Profiler\Profile;
use Symfony\Component\HttpKernel\Profiler\Profiler; use Symfony\Component\HttpKernel\Profiler\Profiler;
use Symfony\Component\HttpFoundation\RequestMatcherInterface; use Symfony\Component\HttpFoundation\RequestMatcherInterface;
@ -32,6 +33,7 @@ class ProfilerListener
protected $exception; protected $exception;
protected $children; protected $children;
protected $requests; protected $requests;
protected $profiles;
/** /**
* Constructor. * Constructor.
@ -48,6 +50,7 @@ class ProfilerListener
$this->onlyException = (Boolean) $onlyException; $this->onlyException = (Boolean) $onlyException;
$this->onlyMasterRequests = (Boolean) $onlyMasterRequests; $this->onlyMasterRequests = (Boolean) $onlyMasterRequests;
$this->children = new \SplObjectStorage(); $this->children = new \SplObjectStorage();
$this->profiles = array();
} }
/** /**
@ -85,14 +88,25 @@ class ProfilerListener
return; return;
} }
$request = $event->getRequest();
$exception = $this->exception; $exception = $this->exception;
$this->exception = null; $this->exception = null;
if (null !== $this->matcher && !$this->matcher->matches($event->getRequest())) { if (null !== $this->matcher && !$this->matcher->matches($request)) {
return; return;
} }
if (!$profile = $this->profiler->collect($event->getRequest(), $event->getResponse(), $exception)) { if (!$profile = $this->profiler->collect($request, $event->getResponse(), $exception)) {
return;
}
$this->profiles[] = $profile;
if (null !== $exception) {
foreach ($this->profiles as $profile) {
$this->profiler->saveProfile($profile);
}
return; return;
} }
@ -100,27 +114,36 @@ class ProfilerListener
if (!$master) { if (!$master) {
array_pop($this->requests); array_pop($this->requests);
$parent = $this->requests[count($this->requests) - 1]; $parent = end($this->requests);
if (!isset($this->children[$parent])) { $profiles = isset($this->children[$parent]) ? $this->children[$parent] : array();
$profiles = array($profile); $profiles[] = $profile;
} else {
$profiles = $this->children[$parent];
$profiles[] = $profile;
}
$this->children[$parent] = $profiles; $this->children[$parent] = $profiles;
} }
// store the profile and its children if (isset($this->children[$request])) {
if (isset($this->children[$event->getRequest()])) { foreach ($this->children[$request] as $child) {
foreach ($this->children[$event->getRequest()] as $child) {
$child->setParent($profile); $child->setParent($profile);
$profile->addChild($child); $profile->addChild($child);
$this->profiler->saveProfile($child);
} }
$this->children[$event->getRequest()] = array(); $this->children[$request] = array();
} }
if ($master) {
$this->saveProfiles($profile);
}
}
/**
* Saves the profile hierarchy.
*
* @param Profile $profile The root profile
*/
private function saveProfiles(Profile $profile)
{
$this->profiler->saveProfile($profile); $this->profiler->saveProfile($profile);
foreach ($profile->getChildren() as $profile) {
$this->saveProfiles($profile);
}
} }
} }