Merge remote-tracking branch 'origin/actStrat'

Author: Seldaek

DependencyInjection/Configuration.php

@@ -63,6 +63,7 @@ public function getConfigTreeBuilder()
                             ->scalarNode('facility')->defaultValue('user')->end() // syslog
                             ->scalarNode('max_files')->defaultValue(0)->end() // rotating
                             ->scalarNode('action_level')->defaultValue('WARNING')->end() // fingers_crossed
+                            ->scalarNode('activation_strategy')->end() // fingers_crossed
                             ->booleanNode('stop_buffering')->defaultTrue()->end()// fingers_crossed
                             ->scalarNode('buffer_size')->defaultValue(0)->end() // fingers_crossed and buffer
                             ->scalarNode('handler')->end() // fingers_crossed and buffer

DependencyInjection/MonologExtension.php

@@ -151,9 +151,18 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
             $nestedHandlerId = $this->getHandlerId($handler['handler']);
             $this->nestedHandlers[] = $nestedHandlerId;
 
+            if (!isset($handler['activation_strategy'])) {
+                $container
+                    ->register($handlerId.'.activation_strategy', '%monolog.handler.fingers_crossed.error_level_activation_strategy.class%')
+                    ->addArgument($handler['activation_level'])
+                ;
+
+                $handler['activation_strategy'] = $handlerId.'.activation_strategy';
+            }
+
             $definition->setArguments(array(
                 new Reference($nestedHandlerId),
-                $handler['action_level'],
+                new Reference($handler['activation_strategy']),
                 $handler['buffer_size'],
                 $handler['bubble'],
                 $handler['stop_buffering'],

Resources/config/monolog.xml

@@ -7,7 +7,6 @@
     <parameters>
         <parameter key="monolog.logger.class">Symfony\Bridge\Monolog\Logger</parameter>
         <parameter key="monolog.handler.stream.class">Monolog\Handler\StreamHandler</parameter>
-        <parameter key="monolog.handler.fingers_crossed.class">Monolog\Handler\FingersCrossedHandler</parameter>
         <parameter key="monolog.handler.group.class">Monolog\Handler\GroupHandler</parameter>
         <parameter key="monolog.handler.buffer.class">Monolog\Handler\BufferHandler</parameter>
         <parameter key="monolog.handler.rotating_file.class">Monolog\Handler\RotatingFileHandler</parameter>
@@ -19,6 +18,9 @@
         <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.fingers_crossed.class">Monolog\Handler\FingersCrossedHandler</parameter>
+        <parameter key="monolog.handler.fingers_crossed.error_level_activation_strategy.class">Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy</parameter>
     </parameters>
 
     <services>