Merge pull request #21 from yatego/master

Make logopts for syslog handler configurable

Author: Seldaek

DependencyInjection/Configuration.php

@@ -60,6 +60,7 @@ public function getConfigTreeBuilder()
                             ->booleanNode('bubble')->defaultTrue()->end()
                             ->scalarNode('path')->defaultValue('%kernel.logs_dir%/%kernel.environment%.log')->end() // stream and rotating
                             ->scalarNode('ident')->defaultFalse()->end() // syslog
+                            ->scalarNode('logopts')->defaultValue(LOG_PID)->end() // syslog
                             ->scalarNode('facility')->defaultValue('user')->end() // syslog
                             ->scalarNode('max_files')->defaultValue(0)->end() // rotating
                             ->scalarNode('action_level')->defaultValue('WARNING')->end() // fingers_crossed

DependencyInjection/MonologExtension.php

@@ -219,6 +219,7 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['facility'],
                 $handler['level'],
                 $handler['bubble'],
+                $handler['logopts'],
             ));
             break;
 

Tests/DependencyInjection/MonologExtensionTest.php

@@ -125,6 +125,21 @@ public function testExceptionWhenUsingDebugName()
         $loader->load(array(array('handlers' => array('debug' => array('type' => 'stream')))), $container);
     }
 
+    public function testSyslogHandlerWithLogopts()
+    {
+        $container = $this->getContainer(array(array('handlers' => array('main' => array('type' => 'syslog', 'logopts' => LOG_CONS)))));
+
+        $this->assertTrue($container->hasDefinition('monolog.logger'));
+        $this->assertTrue($container->hasDefinition('monolog.handler.main'));
+
+        $logger = $container->getDefinition('monolog.logger');
+        $this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
+
+        $handler = $container->getDefinition('monolog.handler.main');
+        $this->assertDICDefinitionClass($handler, '%monolog.handler.syslog.class%');
+        $this->assertDICConstructorArguments($handler, array(false, 'user', \Monolog\Logger::DEBUG, true, LOG_CONS));
+    }
+
     protected function getContainer(array $config = array())
     {
         $container = new ContainerBuilder();