Added channel_rpc_timeout as possible option (#700)

* Added  channel_rpc_timeout as possible option

* This should fix the failing tests.

* Added default value for channel_rpc_timeout in config treebuilder

* Update README with channel_rpc_timeout

* Apply suggestions from code review

Author: bravoman

DependencyInjection/Configuration.php

@@ -92,6 +92,7 @@ protected function addConnections(ArrayNodeDefinition $node)
                             ->booleanNode('lazy')->defaultFalse()->end()
                             ->scalarNode('connection_timeout')->defaultValue(3)->end()
                             ->scalarNode('read_write_timeout')->defaultValue(3)->end()
+                            ->scalarNode('channel_rpc_timeout')->defaultValue(0.0)->end()
                             ->booleanNode('use_socket')->defaultValue(false)->end()
                             ->arrayNode('ssl_context')
                                 ->useAttributeAsKey('key')

README.md

@@ -113,6 +113,9 @@ old_sound_rabbit_mq:
             lazy:     false
             connection_timeout: 3
             read_write_timeout: 3
+            
+            # the timeout when waiting for a response from rabbitMQ (0.0 means waits forever)
+            channel_rpc_timeout: 0.0
 
             # requires php-amqplib v2.4.1+ and PHP5.4+
             keepalive: false

RabbitMq/AMQPConnectionFactory.php

@@ -26,6 +26,7 @@ class AMQPConnectionFactory
         'keepalive'          => false,
         'heartbeat'          => 0,
         'hosts'              => [],
+        'channel_rpc_timeout' => 0.0
     ];
 
     /**

Tests/RabbitMq/AMQPConnectionFactoryTest.php

@@ -284,6 +284,7 @@ public function testSSLConnectionParameters()
                 'context' => null, // context checked earlier
                 'keepalive' => false,
                 'heartbeat' => 0,
+                'channel_rpc_timeout' => 0.0,
             ],
         ], $instance->constructParams);
     }
@@ -359,6 +360,7 @@ public function testClusterConnectionParametersWithoutRootConnectionKeys()
                     'ssl_context'        => null,
                     'keepalive'          => false,
                     'heartbeat'          => 0,
+                    'channel_rpc_timeout' => 0.0,
                 ],
             ],
             $instance::$createConnectionParams
@@ -431,6 +433,7 @@ public function testClusterConnectionParametersWithRootConnectionKeys()
                     'ssl_context'        => null,
                     'keepalive'          => false,
                     'heartbeat'          => 0,
+                    'channel_rpc_timeout' => 0.0,
                 ],
             ],
             $instance::$createConnectionParams
@@ -509,6 +512,7 @@ public function testSSLClusterConnectionParameters()
                 'context' => null,
                 'keepalive' => false,
                 'heartbeat' => 0,
+                'channel_rpc_timeout' => 0.0,
             ],
         ], $instance->constructParams);
 
@@ -543,6 +547,7 @@ public function testSSLClusterConnectionParameters()
                     'context'        => null, // context checked earlier
                     'keepalive'          => false,
                     'heartbeat'          => 0,
+                    'channel_rpc_timeout' => 0.0,
                 ],
             ],
             $instance::$createConnectionParams
@@ -621,6 +626,7 @@ public function testSocketClusterConnectionParameters()
                     'read_write_timeout' => 3,
                     'read_timeout'       => 3,
                     'write_timeout'      => 3,
+                    'channel_rpc_timeout' => 0.0,
                 ],
             ],
             $instance::$createConnectionParams