Merge pull request #22 from hason/sockethandler

Added configuration for socket handler

Author: Seldaek

DependencyInjection/Configuration.php

@@ -112,6 +112,10 @@ public function getConfigTreeBuilder()
                                     ->scalarNode('factory-method')->defaultNull()->end()
                                 ->end()
                             ->end()
+                            ->scalarNode('connection_string')->end() // socket_handler
+                            ->scalarNode('timeout')->end() // socket_handler
+                            ->scalarNode('connection_timeout')->end() // socket_handler
+                            ->booleanNode('persistent')->end() // socket_handler
                             ->arrayNode('channels')
                                 ->fixXmlConfig('channel', 'elements')
                                 ->canBeUnset()
@@ -188,6 +192,10 @@ public function getConfigTreeBuilder()
                             ->ifTrue(function($v) { return 'gelf' === $v['type'] && !isset($v['publisher']); })
                             ->thenInvalid('The publisher has to be specified to use a GelfHandler')
                         ->end()
+                        ->validate()
+                            ->ifTrue(function($v) { return 'socket' === $v['type'] && !isset($v['connection_string']); })
+                            ->thenInvalid('The connection_string has to be specified to use a SocketHandler')
+                        ->end()
                     ->end()
                     ->validate()
                         ->ifTrue(function($v) { return isset($v['debug']); })

DependencyInjection/MonologExtension.php

@@ -260,6 +260,23 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
             ));
             break;
 
+        case 'socket':
+            $definition->setArguments(array(
+                $handler['connection_string'],
+                $handler['level'],
+                $handler['bubble'],
+            ));
+            if (isset($handler['timeout'])) {
+                $definition->addMethodCall('setTimeout', array($handler['timeout']));
+            }
+            if (isset($handler['connection_timeout'])) {
+                $definition->addMethodCall('setConnectionTimeout', array($handler['connection_timeout']));
+            }
+            if (isset($handler['persistent'])) {
+                $definition->addMethodCall('setPersistent', array($handler['persistent']));
+            }
+            break;
+
         // Handlers using the constructor of AbstractHandler without adding their own arguments
         case 'test':
         case 'null':

Resources/config/monolog.xml

@@ -20,6 +20,7 @@
         <parameter key="monolog.handler.debug.class">Symfony\Bridge\Monolog\Handler\DebugHandler</parameter>
         <parameter key="monolog.handler.swift_mailer.class">Monolog\Handler\SwiftMailerHandler</parameter>
         <parameter key="monolog.handler.native_mailer.class">Monolog\Handler\NativeMailerHandler</parameter>
+        <parameter key="monolog.handler.socket.class">Monolog\Handler\SocketHandler</parameter>
 
         <parameter key="monolog.handler.fingers_crossed.class">Monolog\Handler\FingersCrossedHandler</parameter>
         <parameter key="monolog.handler.fingers_crossed.error_level_activation_strategy.class">Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy</parameter>

Tests/DependencyInjection/MonologExtensionTest.php

@@ -15,6 +15,7 @@
 use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\LoggerChannelPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 
 class MonologExtensionTest extends DependencyInjectionTest
 {
@@ -140,6 +141,34 @@ public function testSyslogHandlerWithLogopts()
         $this->assertDICConstructorArguments($handler, array(false, 'user', \Monolog\Logger::DEBUG, true, LOG_CONS));
     }
 
+    public function testSocketHandler()
+    {
+        try {
+            $this->getContainer(array(array('handlers' => array('socket' => array('type' => 'socket')))));
+            $this->fail();
+        } catch (InvalidConfigurationException $e) {
+            $this->assertContains('connection_string', $e->getMessage());
+        }
+
+        $container = $this->getContainer(array(array('handlers' => array('socket' => array(
+            'type' => 'socket', 'timeout' => 1, 'persistent' => true,
+            'connection_string' => 'localhost:50505', 'connection_timeout' => '0.6')
+        ))));
+        $this->assertTrue($container->hasDefinition('monolog.logger'));
+        $this->assertTrue($container->hasDefinition('monolog.handler.socket'));
+
+        $logger = $container->getDefinition('monolog.logger');
+        $this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.socket')));
+
+        $handler = $container->getDefinition('monolog.handler.socket');
+        $this->assertDICDefinitionClass($handler, '%monolog.handler.socket.class%');
+        $this->assertDICConstructorArguments($handler, array('localhost:50505', \Monolog\Logger::DEBUG, true));
+        $this->assertDICDefinitionMethodCallAt(0, $handler, 'setTimeout', array('1'));
+        $this->assertDICDefinitionMethodCallAt(1, $handler, 'setConnectionTimeout', array('0.6'));
+        $this->assertDICDefinitionMethodCallAt(2, $handler, 'setPersistent', array(true));
+
+    }
+
     protected function getContainer(array $config = array())
     {
         $container = new ContainerBuilder();