Merge pull request #82 from AmericanCouncils/fingers_crossed_passthru_level

Added support for the passthruLevel argument in FingersCrossedHandler

Author: Seldaek

DependencyInjection/Configuration.php

@@ -73,6 +73,7 @@
  *   - [excluded_404s]: if set, the strategy will be changed to one that excludes 404s coming from URLs matching any of those patterns
  *   - [buffer_size]: defaults to 0 (unlimited)
  *   - [stop_buffering]: bool to disable buffering once the handler has been activated, defaults to true
+ *   - [passthru_level]: level name or int value for messages to always flush, disabled by default
  *   - [bubble]: bool, defaults to true
  *
  * - filter:
@@ -249,6 +250,7 @@ public function getConfigTreeBuilder()
                             ->scalarNode('action_level')->defaultValue('WARNING')->end() // fingers_crossed
                             ->scalarNode('activation_strategy')->defaultNull()->end() // fingers_crossed
                             ->booleanNode('stop_buffering')->defaultTrue()->end()// fingers_crossed
+                            ->scalarNode('passthru_level')->defaultNull()->end() // fingers_crossed
                             ->arrayNode('excluded_404s') // fingers_crossed
                                 ->canBeUnset()
                                 ->prototype('scalar')->end()

DependencyInjection/MonologExtension.php

@@ -247,6 +247,9 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
 
         case 'fingers_crossed':
             $handler['action_level'] = $this->levelToMonologConst($handler['action_level']);
+            if (null !== $handler['passthru_level']) {
+                $handler['passthru_level'] = $this->levelToMonologConst($handler['passthru_level']);
+            }
             $nestedHandlerId = $this->getHandlerId($handler['handler']);
             $this->nestedHandlers[] = $nestedHandlerId;
 
@@ -267,6 +270,7 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['buffer_size'],
                 $handler['bubble'],
                 $handler['stop_buffering'],
+                $handler['passthru_level']
             ));
             break;
 

Resources/config/schema/monolog-1.0.xsd

@@ -36,6 +36,7 @@
         <xsd:attribute name="host" type="xsd:string" />
         <xsd:attribute name="port" type="xsd:integer" />
         <xsd:attribute name="action-level" type="level" />
+        <xsd:attribute name="passthru-level" type="level" />
         <xsd:attribute name="min-level" type="level" />
         <xsd:attribute name="max-level" type="level" />
         <xsd:attribute name="buffer-size" type="xsd:integer" />

Tests/DependencyInjection/FixtureMonologExtensionTest.php

@@ -39,7 +39,7 @@ public function testLoadWithSeveralHandlers()
 
         $handler = $container->getDefinition('monolog.handler.main');
         $this->assertDICDefinitionClass($handler, '%monolog.handler.fingers_crossed.class%');
-        $this->assertDICConstructorArguments($handler, array(new Reference('monolog.handler.nested'), \Monolog\Logger::ERROR, 0, true, true));
+        $this->assertDICConstructorArguments($handler, array(new Reference('monolog.handler.nested'), \Monolog\Logger::ERROR, 0, true, true, \Monolog\Logger::NOTICE));
 
         $handler = $container->getDefinition('monolog.handler.filtered');
         $this->assertDICDefinitionClass($handler, '%monolog.handler.filter.class%');
@@ -66,7 +66,7 @@ public function testLoadWithOverwriting()
 
         $handler = $container->getDefinition('monolog.handler.main');
         $this->assertDICDefinitionClass($handler, '%monolog.handler.fingers_crossed.class%');
-        $this->assertDICConstructorArguments($handler, array(new Reference('monolog.handler.nested'), \Monolog\Logger::ERROR, 0, true, true));
+        $this->assertDICConstructorArguments($handler, array(new Reference('monolog.handler.nested'), \Monolog\Logger::ERROR, 0, true, true, null));
     }
 
     public function testLoadWithNewAtEnd()

Tests/DependencyInjection/Fixtures/xml/multiple_handlers.xml

@@ -8,7 +8,7 @@
 
     <config>
         <handler name="custom" type="stream" path="/tmp/symfony.log" bubble="false" level="ERROR" />
-        <handler name="main" type="fingers_crossed" action-level="ERROR" handler="nested" />
+        <handler name="main" type="fingers_crossed" action-level="ERROR" passthru-level="NOTICE" handler="nested" />
         <handler name="nested" type="stream" />
         <handler name="filtered" type="filter" handler="nested2">
             <accepted-level>WARNING</accepted-level>

Tests/DependencyInjection/Fixtures/yml/multiple_handlers.yml

@@ -8,6 +8,7 @@ monolog:
         main:
             type: fingers_crossed
             action_level: ERROR
+            passthru_level: NOTICE
             handler: nested
         nested:
             type: stream