feature #264 Add timeouts to the pushover, hipchat, slack handlers (SpacePossum)

This PR was squashed before being merged into the 3.x-dev branch (closes #264).

Discussion
----------

Add timeouts to the pushover, hipchat, slack handlers

Commits
-------

d6242d1 Add timeouts to the pushover, hipchat, slack handlers

Author: fabpot

.travis.yml

@@ -24,12 +24,13 @@ matrix:
       env: SYMFONY_VERSION="2.8.*"
     - php: 5.6
       env: SYMFONY_VERSION="3.4.*" DEPENDENCIES=dev
-    # Test against dev versions
     - php: 7.1
-      env: DEPENDENCIES=dev
     - php: 7.0
     - php: 7.1
     - php: 7.2
+    # Test against dev versions
+    - php: nightly
+      env: DEPENDENCIES=dev
   allow_failures:
     - env: DEPENDENCIES=dev
 

DependencyInjection/Configuration.php

@@ -171,6 +171,8 @@
  *   - [title]: optional title for messages, defaults to the server hostname
  *   - [level]: level name or int value, defaults to DEBUG
  *   - [bubble]: bool, defaults to true
+ *   - [timeout]: float
+ *   - [connection_timeout]: float
  *
  * - raven:
  *   - dsn: connection string
@@ -196,6 +198,8 @@
  *   - [message_format]: text or html, defaults to text
  *   - [host]: defaults to "api.hipchat.com"
  *   - [api_version]: defaults to "v1"
+ *   - [timeout]: float
+ *   - [connection_timeout]: float
  *
  * - slack:
  *   - token: slack api token
@@ -207,6 +211,8 @@
  *   - [include_extra]: bool, defaults to false
  *   - [level]: level name or int value, defaults to DEBUG
  *   - [bubble]: bool, defaults to true
+ *   - [timeout]: float
+ *   - [connection_timeout]: float
  *
  * - slackwebhook:
  *   - webhook_url: slack webhook URL
@@ -542,11 +548,11 @@ public function getConfigTreeBuilder()
                             ->end()
                             ->booleanNode('lazy')->defaultValue(true)->end() // swift_mailer
                             ->scalarNode('connection_string')->end() // socket_handler
-                            ->scalarNode('timeout')->end() // socket_handler & logentries
+                            ->scalarNode('timeout')->end() // socket_handler, logentries, pushover, hipchat & slack
                             ->scalarNode('time')->defaultValue(60)->end() // deduplication
                             ->scalarNode('deduplication_level')->defaultValue(Logger::ERROR)->end() // deduplication
                             ->scalarNode('store')->defaultNull()->end() // deduplication
-                            ->scalarNode('connection_timeout')->end() // socket_handler & logentries
+                            ->scalarNode('connection_timeout')->end() // socket_handler, logentries, pushover, hipchat & slack
                             ->booleanNode('persistent')->end() // socket_handler
                             ->scalarNode('dsn')->end() // raven_handler
                             ->scalarNode('client_id')->defaultNull()->end() // raven_handler

DependencyInjection/MonologExtension.php

@@ -501,6 +501,12 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['level'],
                 $handler['bubble'],
             ));
+            if (isset($handler['timeout'])) {
+                $definition->addMethodCall('setTimeout', array($handler['timeout']));
+            }
+            if (isset($handler['connection_timeout'])) {
+                $definition->addMethodCall('setConnectionTimeout', array($handler['connection_timeout']));
+            }
             break;
 
         case 'hipchat':
@@ -516,6 +522,12 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 !empty($handler['host']) ? $handler['host'] : 'api.hipchat.com',
                 !empty($handler['api_version']) ? $handler['api_version'] : 'v1',
             ));
+            if (isset($handler['timeout'])) {
+                $definition->addMethodCall('setTimeout', array($handler['timeout']));
+            }
+            if (isset($handler['connection_timeout'])) {
+                $definition->addMethodCall('setConnectionTimeout', array($handler['connection_timeout']));
+            }
             break;
 
         case 'slack':
@@ -530,6 +542,12 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['use_short_attachment'],
                 $handler['include_extra'],
             ));
+            if (isset($handler['timeout'])) {
+                $definition->addMethodCall('setTimeout', array($handler['timeout']));
+            }
+            if (isset($handler['connection_timeout'])) {
+                $definition->addMethodCall('setConnectionTimeout', array($handler['connection_timeout']));
+            }
             break;
 
         case 'slackwebhook':

README.md

@@ -2,7 +2,7 @@ MonologBundle
 =============
 
 The `MonologBundle` provides integration of the [Monolog](https://github.com/Seldaek/monolog)
-library into the Symfony2 framework.
+library into the Symfony framework.
 
 More information in the official [documentation](http://symfony.com/doc/current/cookbook/logging/index.html).