From 8fabca609f9dc71d6ca94905ee5b1cfeaab4300e Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Fri, 25 Feb 2011 23:09:45 +0100
Subject: [PATCH] Added monolog tags to create all core channels

---
 .../DoctrineBundle/Resources/config/dbal.xml  |  1 +
 .../Resources/config/mongodb.xml              |  1 +
 .../Resources/config/collectors.xml           |  1 +
 .../Resources/config/debug.xml                |  1 +
 .../Resources/config/profiling.xml            |  1 +
 .../Resources/config/routing.xml              |  1 +
 .../Resources/config/templating_debug.xml     |  1 +
 .../FrameworkBundle/Resources/config/web.xml  |  4 ++
 .../Resources/config/security_acl.xml         |  3 +-
 .../Resources/config/security_listeners.xml   | 14 ++++++-
 .../Resources/config/security_rememberme.xml  | 40 ++++++++++---------
 11 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml b/src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml
index a2860be407..7a36ef919b 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml
+++ b/src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml
@@ -21,6 +21,7 @@
         <service id="doctrine.dbal.logger.debug" class="%doctrine.dbal.logger.debug_class%" public="false" />
 
         <service id="doctrine.dbal.logger" class="%doctrine.dbal.logger_class%" public="false">
+            <tag name="monolog.logger" channel="doctrine" />
             <argument type="service" id="logger" on-invalid="null" />
         </service>
 
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
index 2966f21518..8cd87758a7 100755
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
@@ -87,6 +87,7 @@
         <!-- logger -->
         <service id="doctrine.odm.mongodb.logger" class="%doctrine.odm.mongodb.logger_class%">
             <argument type="service" id="logger" on-invalid="null" />
+            <tag name="monolog.logger" channel="doctrine" />
         </service>
         <service id="doctrine.odm.mongodb.data_collector" class="%doctrine.odm.mongodb.data_collector_class%" public="false">
             <tag name="data_collector" template="DoctrineMongoDBBundle:Collector:mongodb" id="mongodb" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
index c05564b3c5..18d84f1b91 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -37,6 +37,7 @@
 
         <service id="data_collector.logger" class="%data_collector.logger.class%" public="false">
             <tag name="data_collector" template="WebProfilerBundle:Collector:logger" id="logger" priority="255" />
+            <tag name="monolog.logger" channel="profiler" />
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
index c1fefe3eaa..ec149eea85 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
@@ -10,6 +10,7 @@
 
     <services>
         <service id="debug.event_dispatcher" class="%debug.event_dispatcher.class%">
+            <tag name="monolog.logger" channel="event" />
             <argument type="service" id="service_container" />
             <argument type="service" id="logger" on-invalid="null" />
         </service>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
index 0659d3b023..7f81d21237 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
@@ -11,6 +11,7 @@
 
     <services>
         <service id="profiler" class="%profiler.class%" scope="request">
+            <tag name="monolog.logger" channel="profiler" />
             <argument type="service" id="profiler.storage" />
             <argument type="service" id="logger" on-invalid="null" />
         </service>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
index 6467e7b575..e14491eb6d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -48,6 +48,7 @@
         </service>
 
         <service id="routing.loader.real" class="%routing.loader.class%">
+            <tag name="monolog.logger" channel="router" />
             <argument type="service" id="controller_name_converter" />
             <argument type="service" id="logger" on-invalid="null" />
             <argument type="service" id="routing.resolver" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml
index f4ff8d6859..0d3cebebea 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml
@@ -10,6 +10,7 @@
 
     <services>
         <service id="templating.debugger" class="%templating.debugger.class%" public="false">
+            <tag name="monolog.logger" channel="templating" />
             <argument type="service" id="logger" on-invalid="null" />
         </service>
     </services>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
index 61637e7166..b64deabab4 100755
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -15,11 +15,13 @@
 
     <services>
         <service id="controller_name_converter" class="%controller_name_converter.class%" public="false">
+            <tag name="monolog.logger" channel="request" />
             <argument type="service" id="kernel" />
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
         <service id="controller_resolver" class="%controller_resolver.class%" public="false">
+            <tag name="monolog.logger" channel="request" />
             <argument type="service" id="service_container" />
             <argument type="service" id="controller_name_converter" />
             <argument type="service" id="logger" on-invalid="ignore" />
@@ -27,6 +29,7 @@
 
         <service id="request_listener" class="%request_listener.class%">
             <tag name="kernel.listener" event="onCoreRequest" />
+            <tag name="monolog.logger" channel="request" />
             <argument type="service" id="service_container" />
             <argument type="service" id="router" />
             <argument type="service" id="logger" on-invalid="ignore" />
@@ -39,6 +42,7 @@
 
         <service id="exception_listener" class="%exception_listener.class%">
             <tag name="kernel.listener" event="onCoreException" priority="-128" />
+            <tag name="monolog.logger" channel="request" />
             <argument>%exception_listener.controller%</argument>
             <argument type="service" id="logger" on-invalid="null" />
         </service>
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
index c789929290..b920560451 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
@@ -60,7 +60,7 @@
 
         <service id="security.acl.cache.doctrine" class="%security.acl.cache.doctrine.class%" public="false">
             <argument type="service" id="security.acl.cache.doctrine_cache_impl" />
-            <argument type="service" id="security.acl.permission_granting_strategy" />        
+            <argument type="service" id="security.acl.permission_granting_strategy" />
             <argument>%security.acl.cache.doctrine.prefix%</argument>
         </service>
 
@@ -69,6 +69,7 @@
         <service id="security.acl.permission.map" class="%security.acl.permission.map.class%" public="false"></service>
 
         <service id="security.acl.voter.basic_permissions" class="%security.acl.voter.class%" public="false">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.acl.provider" />
             <argument type="service" id="security.acl.object_identity_retrieval_strategy" />
             <argument type="service" id="security.acl.security_identity_retrieval_strategy" />
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
index 2f5063f826..f7bcf5dd93 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -41,6 +41,7 @@
 
     <services>
         <service id="security.authentication.listener.anonymous" class="%security.authentication.listener.anonymous.class%" public="false">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument /> <!-- Key -->
             <argument type="service" id="logger" on-invalid="null" />
@@ -57,6 +58,7 @@
         <service id="security.authentication.digest_entry_point" class="%security.authentication.digest_entry_point.class%" public="false" />
 
         <service id="security.channel_listener" class="%security.channel_listener.class%" public="false">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.access_map" />
             <argument type="service" id="security.authentication.retry_entry_point" />
             <argument type="service" id="logger" on-invalid="null" />
@@ -65,6 +67,7 @@
         <service id="security.access_map" class="%security.access_map.class%" public="false" />
 
         <service id="security.context_listener" class="%security.context_listener.class%" public="false">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument type="collection"></argument>
             <argument /> <!-- Provider Key -->
@@ -84,6 +87,7 @@
         <service id="security.authentication.form_entry_point" class="%security.authentication.form_entry_point.class%" public="false" abstract="true" />
 
         <service id="security.authentication.listener.abstract" abstract="true" public="false">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument type="service" id="security.authentication.manager" />
             <argument type="service" id="security.authentication.session_strategy" />
@@ -95,13 +99,14 @@
             <argument type="service" id="event_dispatcher" on-invalid="null"/>
         </service>
 
-        <service id="security.authentication.listener.form" 
-                 class="%security.authentication.listener.form.class%" 
+        <service id="security.authentication.listener.form"
+                 class="%security.authentication.listener.form.class%"
                  parent="security.authentication.listener.abstract"
                  abstract="true">
         </service>
 
         <service id="security.authentication.listener.x509" class="%security.authentication.listener.x509.class%" public="false" abstract="true">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument type="service" id="security.authentication.manager" />
             <argument /> <!-- Provider-shared Key -->
@@ -112,6 +117,7 @@
         </service>
 
         <service id="security.authentication.listener.basic" class="%security.authentication.listener.basic.class%" public="false" abstract="true">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument type="service" id="security.authentication.manager" />
             <argument /> <!-- Provider-shared Key -->
@@ -120,6 +126,7 @@
         </service>
 
         <service id="security.authentication.listener.digest" class="%security.authentication.listener.digest.class%" public="false" abstract="true">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument /> <!-- User Provider -->
             <argument /> <!-- Provider-shared Key -->
@@ -140,6 +147,7 @@
         </service>
 
         <service id="security.exception_listener" class="%security.exception_listener.class%" public="false" abstract="true">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument type="service" id="security.authentication.trust_resolver" />
             <argument type="service" id="security.authentication.entry_point" on-invalid="null" />
@@ -149,6 +157,7 @@
         </service>
 
         <service id="security.authentication.switchuser_listener" class="%security.authentication.switchuser_listener.class%" public="false" abstract="true">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument /> <!-- User Provider -->
             <argument type="service" id="security.user_checker" />
@@ -161,6 +170,7 @@
         </service>
 
         <service id="security.access_listener" class="%security.access_listener.class%" public="false">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument type="service" id="security.access.decision_manager" />
             <argument type="service" id="security.access_map" />
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
index 9f0cd54c40..0bb4d41436 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
@@ -6,53 +6,55 @@
 
     <parameters>
         <parameter key="security.authentication.provider.rememberme.class">Symfony\Component\Security\Core\Authentication\Provider\RememberMeAuthenticationProvider</parameter>
-        
+
         <parameter key="security.authentication.listener.rememberme.class">Symfony\Component\Security\Http\Firewall\RememberMeListener</parameter>
-        <parameter key="security.rememberme.token.provider.in_memory.class">Symfony\Component\Security\Core\Authentication\RememberMe\InMemoryTokenProvider</parameter>
-        
+        <parameter key="security.rembemerme.token.provider.in_memory.class">Symfony\Component\Security\Core\Authentication\RememberMe\InMemoryTokenProvider</parameter>
+
         <parameter key="security.authentication.rememberme.services.persistent.class">Symfony\Component\Security\Http\RememberMe\PersistentTokenBasedRememberMeServices</parameter>
         <parameter key="security.authentication.rememberme.services.simplehash.class">Symfony\Component\Security\Http\RememberMe\TokenBasedRememberMeServices</parameter>
-        
+
         <parameter key="security.rememberme.response_listener.class">Symfony\Bundle\SecurityBundle\ResponseListener</parameter>
     </parameters>
-    
+
     <services>
         <service id="security.authentication.listener.rememberme" class="%security.authentication.listener.rememberme.class%" public="false" abstract="true">
+            <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument type="service" id="security.authentication.rememberme" />
             <argument type="service" id="security.authentication.manager" />
             <argument type="service" id="logger" on-invalid="null" />
         </service>
-        
+
         <service id="security.authentication.provider.rememberme" class="%security.authentication.provider.rememberme.class%" abstract="true" public="false">
             <argument type="service" id="security.user_checker" />
         </service>
 
-        <service id="security.rememberme.token.provider.in_memory" class="%security.rememberme.token.provider.in_memory.class%" public="false"></service>
-        
+        <service id="security.rememberme.token.provider.in_memory" class="%security.rembemerme.token.provider.in_memory.class%" public="false"></service>
+
         <service id="security.authentication.rememberme.services.abstract" abstract="true" public="false">
+            <tag name="monolog.logger" channel="security" />
             <argument type="collection" /> <!--  User Providers -->
             <argument /> <!-- Shared Token Key -->
             <argument /> <!-- Shared Provider Key -->
             <argument type="collection" /> <!-- Options -->
             <argument type="service" id="logger" on-invalid="null" />
         </service>
-        
-        <service id="security.authentication.rememberme.services.persistent" 
+
+        <service id="security.authentication.rememberme.services.persistent"
                  class="%security.authentication.rememberme.services.persistent.class%"
-                 parent="security.authentication.rememberme.services.abstract" 
-                 abstract="true">
-        </service>
-        
-        <service id="security.authentication.rememberme.services.simplehash" 
-                 class="%security.authentication.rememberme.services.simplehash.class%" 
                  parent="security.authentication.rememberme.services.abstract"
                  abstract="true">
         </service>
-        
+
+        <service id="security.authentication.rememberme.services.simplehash"
+                 class="%security.authentication.rememberme.services.simplehash.class%"
+                 parent="security.authentication.rememberme.services.abstract"
+                 abstract="true">
+        </service>
+
         <service id="security.rememberme.response_listener" class="%security.rememberme.response_listener.class%">
             <tag name="kernel.listener" event="onCoreResponse"/>
         </service>
     </services>
-    
-</container>    
\ No newline at end of file
+
+</container>