Merge branch '2.3' into 2.4

weaverryan · weaverryan · commit fe0571ac9c87 · 2013-11-28T12:12:11.000-06:00
diff --git a/cookbook/logging/channels_handlers.rst b/cookbook/logging/channels_handlers.rst
@@ -81,12 +81,62 @@ Creating your own Channel
 -------------------------
 
 You can change the channel monolog logs to one service at a time. This is done
-by tagging your service with ``monolog.logger`` and specifying which channel
-the service should log to. By doing this, the logger that is injected into
-that service is preconfigured to use the channel you've specified.
+either via the :ref:`configuration <cookbook-monolog-channels-config>` below
+or by tagging your service with :ref:`monolog.logger<dic_tags-monolog>` and
+specifying which channel the service should log to. With the tag, the logger
+that is injected into that service is preconfigured to use the channel you've
+specified.
 
-For more information - including a full example - read ":ref:`dic_tags-monolog`"
-in the Dependency Injection Tags reference section.
+.. _cookbook-monolog-channels-config:
+
+Configure Additional Channels without Tagged Services
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionadded:: 2.3
+    This feature was introduced to the MonologBundle in version 2.4. This
+    version is compatible with Symfony 2.3, but only MonologBundle 2.3 is
+    installed by default. To use this feature, upgrade your bundle manually.
+
+With MonologBundle 2.4 you can configure additional channels without the
+need to tag your services:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        monolog:
+            channels: ["foo", "bar"]
+
+    .. code-block:: xml
+
+        <!-- app/config/config.xml -->
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:monolog="http://symfony.com/schema/dic/monolog"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/monolog
+                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"
+        >
+            <monolog:config>
+                <monolog:channel>foo</monolog:channel>
+                <monolog:channel>bar</monolog:channel>
+            </monolog:config>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('monolog', array(
+            'channels' => array(
+                'foo',
+                'bar',
+            ),
+        ));
+
+With this, you can now send log messages to the ``foo`` channel by using
+the automatically registered logger service ``monolog.logger.foo``.
 
 Learn more from the Cookbook
 ----------------------------
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -663,6 +663,12 @@ channel when injecting the logger in a service.
         $definition->addTag('monolog.logger', array('channel' => 'acme'));
         $container->register('my_service', $definition);
 
+.. tip::
+
+    If you use MonologBundle 2.4 or higher, you can configure custom channels
+    in the configuration and retrieve the corresponding logger service from
+    the service container directly (see :ref:`cookbook-monolog-channels-config`).
+
 .. _dic_tags-monolog-processor:
 
 monolog.processor
