Merge pull request #1056 from ChristianRiesen/connection-timeout-option

Add connectTimeout to options

Author: merk

DependencyInjection/Configuration.php

@@ -130,13 +130,15 @@ private function addClientsSection(ArrayNodeDefinition $rootNode)
                                         ->end()
                                         ->scalarNode('transport')->end()
                                         ->scalarNode('timeout')->end()
+                                        ->scalarNode('connectTimeout')->end()
                                         ->scalarNode('retryOnConflict')
                                             ->defaultValue(0)
                                         ->end()
                                     ->end()
                                 ->end()
                             ->end()
                             ->scalarNode('timeout')->end()
+                            ->scalarNode('connectTimeout')->end()
                             ->scalarNode('headers')->end()
                             ->scalarNode('connectionStrategy')->defaultValue('Simple')->end()
                         ->end()

DependencyInjection/FOSElasticaExtension.php

@@ -110,6 +110,7 @@ private function loadClients(array $clients, ContainerBuilder $container)
             if (false !== $logger) {
                 $clientDef->addMethodCall('setLogger', array(new Reference($logger)));
             }
+
             $clientDef->addTag('fos_elastica.client');
 
             $container->setDefinition($clientId, $clientDef);

Tests/DependencyInjection/ConfigurationTest.php

@@ -293,4 +293,23 @@ public function testCompressionDefaultConfig()
 
         $this->assertFalse($configuration['clients']['default']['connections'][0]['compression']);
     }
+
+    public function testTimeoutConfig()
+    {
+        $configuration = $this->getConfigs(array(
+            'clients' => array(
+                'simple_timeout'       => array(
+                    'url'    => 'http://localhost:9200',
+                    'timeout' => 123,
+                ),
+                'connect_timeout'      => array(
+                    'url'    => 'http://localhost:9200',
+                    'connectTimeout' => 234,
+                ),
+            ),
+        ));
+
+        $this->assertEquals(123, $configuration['clients']['simple_timeout']['connections'][0]['timeout']);
+        $this->assertEquals(234, $configuration['clients']['connect_timeout']['connections'][0]['connectTimeout']);
+    }
 }