Merge pull request #196 from lyrixx/server-log

Added support for ServerLog command

Author: Seldaek

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.0 (xxxx-xx-xx)
+
+* Added support for server_log handler
+
 ## 3.0.3 (2017-01-10)
 
 * Fixed deprecation notices when using Symfony 3.3+ and PHP7+

DependencyInjection/Configuration.php

@@ -281,6 +281,11 @@
  *   - [level]: level name or int value, defaults to DEBUG
  *   - [bubble]: bool, defaults to true
  *
+ * - server_log:
+ *   - host: server log host. ex: 127.0.0.1:9911
+ *   - [level]: level name or int value, defaults to DEBUG
+ *   - [bubble]: bool, defaults to true
+ *
  * @author Jordi Boggiano <[email protected]>
  * @author Christophe Coevoet <[email protected]>
  */
@@ -768,6 +773,10 @@ public function getConfigTreeBuilder()
                             ->ifTrue(function ($v) { return 'flowdock' === $v['type'] && empty($v['source']); })
                             ->thenInvalid('The source has to be specified to use a FlowdockHandler')
                         ->end()
+                        ->validate()
+                            ->ifTrue(function ($v) { return 'server_log' === $v['type'] && empty($v['host']); })
+                            ->thenInvalid('The host has to be specified to use a ServerLogHandler')
+                        ->end()
                     ->end()
                     ->validate()
                         ->ifTrue(function ($v) { return isset($v['debug']); })

DependencyInjection/MonologExtension.php

@@ -677,6 +677,17 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['app_name'],
             ));
             break;
+        case 'server_log':
+            if (!class_exists('Symfony\Bridge\Monolog\Handler\ServerLogHandler')) {
+                throw new \RuntimeException('The ServerLogHandler is not available. Please update "symfony/monolog-bridge" to 3.3.');
+            }
+
+            $definition->setArguments(array(
+                $handler['host'],
+                $handler['level'],
+                $handler['bubble'],
+            ));
+            break;
 
         // Handlers using the constructor of AbstractHandler without adding their own arguments
         case 'browser_console':
@@ -759,6 +770,7 @@ private function getHandlerClassByType($handlerType)
             'filter' => 'Monolog\Handler\FilterHandler',
             'mongo' => 'Monolog\Handler\MongoDBHandler',
             'elasticsearch' => 'Monolog\Handler\ElasticSearchHandler',
+            'server_log' => 'Symfony\Bridge\Monolog\Handler\ServerLogHandler',
         );
 
         if (!isset($typeToClassMapping[$handlerType])) {

Resources/doc/index.rst

@@ -9,7 +9,7 @@ following command to download the latest stable version of this bundle:
 
 .. code-block:: bash
 
-    $ composer require symfony/monolog-bundle "~2.7"
+    $ composer require symfony/monolog-bundle
 
 This command requires you to have Composer installed globally, as explained
 in the `installation chapter`_ of the Composer documentation.

Tests/DependencyInjection/FixtureMonologExtensionTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\MonologBundle\Tests\DependencyInjection;
 
 use Symfony\Bundle\MonologBundle\DependencyInjection\MonologExtension;
+use Symfony\Bridge\Monolog\Handler\ServerLogHandler;
 use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\LoggerChannelPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -154,6 +155,21 @@ public function testSingleEmailRecipient()
         ), $container->getDefinition('monolog.handler.swift.mail_message_factory')->getArguments());
     }
 
+    public function testServerLog()
+    {
+        if (!class_exists('Symfony\Bridge\Monolog\Handler\ServerLogHandler')) {
+            $this->markTestSkipped('The ServerLogHandler is not available.');
+        }
+
+        $container = $this->getContainer('server_log');
+
+        $this->assertEquals(array(
+            '0:9911',
+            100,
+            true,
+        ), $container->getDefinition('monolog.handler.server_log')->getArguments());
+    }
+
     public function testMultipleEmailRecipients()
     {
         $container = $this->getContainer('multiple_email_recipients');

Tests/DependencyInjection/Fixtures/xml/server_log.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<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:handler
+            name="server_log"
+            type="server_log"
+            host="0:9911" />
+    </monolog:config>
+</container>

Tests/DependencyInjection/Fixtures/yml/server_log.yml

@@ -0,0 +1,5 @@
+monolog:
+    handlers:
+        server_log:
+            type:       server_log
+            host:       0:9911