Merge remote-tracking branch 'dquerioux/master'

Author: Seldaek

DependencyInjection/Configuration.php

@@ -173,6 +173,7 @@
  * - newrelic:
  *   - [level]: level name or int value, defaults to DEBUG
  *   - [bubble]: bool, defaults to true
+ *   - [app-name]: new relic app name, default null
  *
  * - hipchat:
  *   - token: hipchat api token
@@ -298,6 +299,7 @@ public function getConfigTreeBuilder()
                             ->scalarNode('priority')->defaultValue(0)->end()
                             ->scalarNode('level')->defaultValue('DEBUG')->end()
                             ->booleanNode('bubble')->defaultTrue()->end()
+                            ->scalarNode('app-name')->defaultNull()->end()
                             ->booleanNode('include_stacktraces')->defaultFalse()->end()
                             ->scalarNode('path')->defaultValue('%kernel.logs_dir%/%kernel.environment%.log')->end() // stream and rotating
                             ->scalarNode('file_permission')  // stream and rotating

DependencyInjection/MonologExtension.php

@@ -625,10 +625,16 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['bubble'],
             ));
             break;
+        case 'newrelic':
+            $definition->setArguments(array(
+                $handler['level'],
+                $handler['bubble'],
+                $handler['app-name'],
+            ));
+            break;
 
         // Handlers using the constructor of AbstractHandler without adding their own arguments
         case 'browser_console':
-        case 'newrelic':
         case 'test':
         case 'null':
         case 'debug':

Resources/config/schema/monolog-1.0.xsd

@@ -32,6 +32,7 @@
         <xsd:attribute name="priority" type="xsd:integer" />
         <xsd:attribute name="level" type="level" />
         <xsd:attribute name="bubble" type="xsd:boolean" />
+        <xsd:attribute name="app-name" type="xsd:string" />
         <xsd:attribute name="path" type="xsd:string" />
         <xsd:attribute name="id" type="xsd:string" />
         <xsd:attribute name="name" type="xsd:string" use="required" />