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

created a new collectors.xml file for a better separation

This commit is contained in:
Fabien Potencier 2010-06-25 16:40:36 +02:00
parent 28c1fb2e4c
commit 898adc6ef9
3 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
View File

@ -73,6 +73,7 @@ class WebExtension extends LoaderExtension
if (!$configuration->hasDefinition('profiler')) {
$loader = new XmlFileLoader(__DIR__.'/../Resources/config');
$configuration->merge($loader->load('profiling.xml'));
$configuration->merge($loader->load('collectors.xml'));
}
} elseif ($configuration->hasDefinition('profiler')) {
$configuration->getDefinition('profiling')->clearAnnotations();

34
src/Symfony/Framework/FoundationBundle/Resources/config/collectors.xml Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" ?>
<container xmlns="http://www.symfony-project.org/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
<parameters>
<parameter key="data_collector.config.class">Symfony\Framework\FoundationBundle\DataCollector\ConfigDataCollector</parameter>
<parameter key="data_collector.app.class">Symfony\Framework\FoundationBundle\DataCollector\AppDataCollector</parameter>
<parameter key="data_collector.timer.class">Symfony\Framework\FoundationBundle\DataCollector\TimerDataCollector</parameter>
<parameter key="data_collector.memory.class">Symfony\Components\HttpKernel\Profiler\DataCollector\MemoryDataCollector</parameter>
</parameters>
<services>
<service id="data_collector.config" class="%data_collector.config.class%">
<annotation name="data_collector" core="true" />
<argument type="service" id="service_container" />
</service>
<service id="data_collector.app" class="%data_collector.app.class%">
<annotation name="data_collector" core="true" />
<argument type="service" id="service_container" />
</service>
<service id="data_collector.timer" class="%data_collector.timer.class%">
<annotation name="data_collector" core="true" />
<argument type="service" id="service_container" />
</service>
<service id="data_collector.memory" class="%data_collector.memory.class%">
<annotation name="data_collector" core="true" />
</service>
</services>
</container>

23
src/Symfony/Framework/FoundationBundle/Resources/config/profiling.xml
View File

@ -10,10 +10,6 @@
<parameter key="profiler.storage.file">%kernel.cache_dir%/profiler.db</parameter>
<parameter key="profiler.storage.lifetime">86400</parameter>
<parameter key="profiling.class">Symfony\Components\HttpKernel\Listener\Profiling</parameter>
<parameter key="data_collector.config.class">Symfony\Framework\FoundationBundle\DataCollector\ConfigDataCollector</parameter>
<parameter key="data_collector.app.class">Symfony\Framework\FoundationBundle\DataCollector\AppDataCollector</parameter>
<parameter key="data_collector.timer.class">Symfony\Framework\FoundationBundle\DataCollector\TimerDataCollector</parameter>
<parameter key="data_collector.memory.class">Symfony\Components\HttpKernel\Profiler\DataCollector\MemoryDataCollector</parameter>
</parameters>
<services>
@ -33,24 +29,5 @@
<annotation name="kernel.listener" />
<argument type="service" id="profiler" />
</service>
<service id="data_collector.config" class="%data_collector.config.class%">
<annotation name="data_collector" core="true" />
<argument type="service" id="service_container" />
</service>
<service id="data_collector.app" class="%data_collector.app.class%">
<annotation name="data_collector" core="true" />
<argument type="service" id="service_container" />
</service>
<service id="data_collector.timer" class="%data_collector.timer.class%">
<annotation name="data_collector" core="true" />
<argument type="service" id="service_container" />
</service>
<service id="data_collector.memory" class="%data_collector.memory.class%">
<annotation name="data_collector" core="true" />
</service>
</services>
</container>