Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

split timeout into read and write timeouts #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

split timeout into read and write timeouts #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions src/AmqpBundle/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,37 @@ protected function addConnections(ArrayNodeDefinition $node)
->scalarNode('class')->defaultValue('%m6_web_amqp.connection.class%')->end()
->scalarNode('host')->defaultValue('localhost')->end()
->scalarNode('port')->defaultValue(5672)->end()
->scalarNode('timeout')->defaultValue(10)->end()
->scalarNode('timeout')
->defaultValue(10)
->info('Read timeout for connection. Left for backwards compatibility. Use read_timeout instead')
->end()
->scalarNode('read_timeout')
->defaultNull()
->info('Read timeout for connection. If ommitted - use timeout value. Left for backwards compatibility')
->end()
->scalarNode('write_timeout')
->defaultValue(10)
->info('Write timeout for connection')
->end()
->scalarNode('heartbeat')
->defaultValue(5)
->info('Send heartbeat every N seconds. RabbitMQ recommend to use timeout / 2. Supported from 1.6.0beta4 version of amqp extension')
->info('Send heartbeat every N seconds. RabbitMQ recommend to use read_timeout / 2. Supported from 1.6.0beta4 version of amqp extension')
->end()
->scalarNode('login')->defaultValue('guest')->end()
->scalarNode('password')->defaultValue('guest')->end()
->scalarNode('vhost')->defaultValue('/')->end()
->booleanNode('lazy')->defaultFalse()->end()
->end()
//backwards compatibility part to copy timeout value to read_timeout if read_timeout is not set
->validate()
->always(function($v) {
if ($v['read_timeout'] === null) {
$v['read_timeout'] = $v['timeout'];
}

return $v;
})
->end()
->end()
->end()
->end();
Expand Down
7 changes: 5 additions & 2 deletions src/AmqpBundle/DependencyInjection/M6WebAmqpExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,15 @@ protected function loadConnections(ContainerBuilder $container, array $config)
$connectionDefinition = new Definition($connection['class']);
$connectionDefinition->addMethodCall('setHost ', [$connection['host']])
->addMethodCall('setPort', [$connection['port']])
->addMethodCall('setReadTimeout', [$connection['timeout']])
->addMethodCall('setLogin', [$connection['login']])
->addMethodCall('setPassword', [$connection['password']])
->addMethodCall('setVhost', [$connection['vhost']]);

$connectionDefinition->setArguments([['heartbeat' => $connection['heartbeat']]]);
$connectionDefinition->setArguments([[
'heartbeat' => $connection['heartbeat'],
'read_timeout' => $connection['read_timeout'],
'write_timeout' => $connection['write_timeout'],
]]);

if ($config['prototype']) {
$connectionDefinition->setShared(false);
Expand Down
20 changes: 20 additions & 0 deletions src/AmqpBundle/Tests/Fixtures/queue-arguments-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,26 @@ m6_web_amqp:
vhost: '/'
lazy: true
heartbeat: 1
with_read_timeout_and_timeout:
host: 'localhost'
port: 5672
read_timeout: 100
write_timeout: 50
timeout: 3
login: 'guest'
password: 'guest'
vhost: '/'
lazy: true
heartbeat: 1
with_read_timeout_only:
host: 'localhost'
port: 5672
read_timeout: 100
login: 'guest'
password: 'guest'
vhost: '/'
lazy: true
heartbeat: 1
producers:
producer_1:
connection: default
Expand Down
17 changes: 17 additions & 0 deletions src/AmqpBundle/Tests/Units/DependencyInjection/M6WebAmqpExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,23 @@ public function testQueueArgumentsConfig()
->hasSize(1)
->integer($connectionArguments[0]['heartbeat'])
->isEqualTo(1);
$this
->boolean($container->has('m6_web_amqp.connection.with_read_timeout_and_timeout'))
->isTrue()
->array($connectionArguments = $container->getDefinition('m6_web_amqp.connection.with_read_timeout_and_timeout')->getArguments())
->hasSize(1)
->integer($connectionArguments[0]['read_timeout'])
->isEqualTo(100)
->integer($connectionArguments[0]['write_timeout'])
->isEqualTo(50);

$this
->boolean($container->has('m6_web_amqp.connection.with_read_timeout_only'))
->isTrue()
->array($connectionArguments = $container->getDefinition('m6_web_amqp.connection.with_read_timeout_only')->getArguments())
->hasSize(1)
->integer($connectionArguments[0]['read_timeout'])
->isEqualTo(100);
}

public function testSandboxClasses()
Expand Down