Merge remote-tracking branch 'fotomerchant/feature/slackConfig'

Conflicts:
	Resources/config/schema/monolog-1.0.xsd

Author: Seldaek

DependencyInjection/Configuration.php

@@ -160,6 +160,15 @@
  *   - [nickname]: defaults to Monolog
  *   - [level]: level name or int value, defaults to DEBUG
  *   - [bubble]: bool, defaults to true
+ *   
+ * - slack:
+ *   - token: slack api token
+ *   - channel: channel name
+ *   - [bot_name]: defaults to Monolog
+ *   - [icon_emoji]: defaults to null
+ *   - [use_attachment]: bool, defaults to true
+ *   - [level]: level name or int value, defaults to DEBUG
+ *   - [bubble]: bool, defaults to true
  *
  * - cube:
  *   - url: http/udp url to the cube server
@@ -285,9 +294,13 @@ public function getConfigTreeBuilder()
                             ->scalarNode('exchange')->end() // amqp
                             ->scalarNode('exchange_name')->defaultValue('log')->end() // amqp
                             ->scalarNode('room')->end() // hipchat
+                            ->scalarNode('channel')->end() // slack
+                            ->scalarNode('bot_name')->defaultValue('Monolog')->end() // slack
+                            ->scalarNode('use_attachment')->defaultTrue()->end() // slack
+                            ->scalarNode('icon_emoji')->defaultNull()->end() // slack
                             ->scalarNode('notify')->defaultFalse()->end() // hipchat
                             ->scalarNode('nickname')->defaultValue('Monolog')->end() // hipchat
-                            ->scalarNode('token')->end() // pushover & hipchat & loggly & logentries & flowdock & rollbar
+                            ->scalarNode('token')->end() // pushover & hipchat & loggly & logentries & flowdock & rollbar & slack
                             ->scalarNode('source')->end() // flowdock
                             ->booleanNode('use_ssl')->defaultTrue()->end() // logentries
                             ->variableNode('user') // pushover
@@ -577,6 +590,10 @@ public function getConfigTreeBuilder()
                             ->ifTrue(function ($v) { return 'hipchat' === $v['type'] && (empty($v['token']) || empty($v['room'])); })
                             ->thenInvalid('The token and room have to be specified to use a HipChatHandler')
                         ->end()
+                        ->validate()
+                            ->ifTrue(function ($v) { return 'slack' === $v['type'] && (empty($v['token']) || empty($v['channel'])); })
+                            ->thenInvalid('The token and channel have to be specified to use a SlackHandler')
+                        ->end()
                         ->validate()
                             ->ifTrue(function ($v) { return 'cube' === $v['type'] && empty($v['url']); })
                             ->thenInvalid('The url has to be specified to use a CubeHandler')

DependencyInjection/MonologExtension.php

@@ -440,6 +440,18 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['bubble'],
             ));
             break;
+            
+        case 'slack':
+            $definition->setArguments(array(
+                $handler['token'],
+                $handler['channel'],
+                $handler['bot_name'],
+                $handler['use_attachment'],
+                $handler['icon_emoji'],
+                $handler['level'],
+                $handler['bubble'],
+            ));
+            break;
 
         case 'cube':
             $definition->setArguments(array(

Resources/config/monolog.xml

@@ -31,6 +31,7 @@
         <parameter key="monolog.handler.raven.class">Monolog\Handler\RavenHandler</parameter>
         <parameter key="monolog.handler.newrelic.class">Monolog\Handler\NewRelicHandler</parameter>
         <parameter key="monolog.handler.hipchat.class">Monolog\Handler\HipChatHandler</parameter>
+        <parameter key="monolog.handler.slack.class">Monolog\Handler\SlackHandler</parameter>
         <parameter key="monolog.handler.cube.class">Monolog\Handler\CubeHandler</parameter>
         <parameter key="monolog.handler.amqp.class">Monolog\Handler\AmqpHandler</parameter>
         <parameter key="monolog.handler.error_log.class">Monolog\Handler\ErrorLogHandler</parameter>

Resources/config/schema/monolog-1.0.xsd

@@ -57,6 +57,10 @@
         <xsd:attribute name="use-ssl" type="xsd:boolean" />
         <xsd:attribute name="formatter" type="xsd:string" />
         <xsd:attribute name="token" type="xsd:string" />
+        <xsd:attribute name="channel" type="xsd:string" />
+        <xsd:attribute name="bot-name" type="xsd:string" />
+        <xsd:attribute name="use-attachment" type="xsd:boolean" />
+        <xsd:attribute name="icon-emoji" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:simpleType name="level">