Skip to content

Commit 58617ac

Browse files
devrckdevrck
authored
Merge branch 'master' into batch-consumer
2 parents db49a24 + 42e7c46 commit 58617ac

27 files changed

+823
-31
lines changed

‎CHANGELOG‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
- 2017-01-22
2+
* Add `graceful_max_execution_timeout`
3+
14
- 2015-02-07
25
* Added possibility to set serialize/unserialize function for rpc servers/clients
36

‎Command/DeleteCommand.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Symfony\Component\Console\Input\InputInterface;
77
use Symfony\Component\Console\Input\InputOption;
88
use Symfony\Component\Console\Output\OutputInterface;
9+
use Symfony\Component\Console\Question\ConfirmationQuestion;
910

1011
/**
1112
* Command to delete a queue
@@ -32,8 +33,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
3233
$noConfirmation = (bool) $input->getOption('no-confirmation');
3334

3435
if (!$noConfirmation && $input->isInteractive()) {
35-
$confirmation = $this->getHelper('dialog')->askConfirmation($output, sprintf('<question>Are you sure you wish to delete "%s" consumer\'s queue?(y/n)</question>', $input->getArgument('name')), false);
36-
if (!$confirmation) {
36+
$question = new ConfirmationQuestion(
37+
sprintf(
38+
'<question>Are you sure you wish to delete "%s" consumer\'s queue? (y/n)</question>',
39+
$input->getArgument('name')
40+
),
41+
false
42+
);
43+
44+
if (!$this->getHelper('question')->ask($input, $output, $question)) {
3745
$output->writeln('<error>Deletion cancelled!</error>');
3846

3947
return 1;

‎Command/MultipleConsumerCommand.php‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,28 @@
22

33
namespace OldSound\RabbitMqBundle\Command;
44

5+
use Symfony\Component\Console\Input\InputArgument;
6+
57
class MultipleConsumerCommand extends BaseConsumerCommand
68
{
79
protected function configure()
810
{
911
parent::configure();
1012

11-
$this->setDescription('Executes a consumer that uses multiple queues');
12-
$this->setName('rabbitmq:multiple-consumer');
13+
$this->setDescription('Executes a consumer that uses multiple queues')
14+
->setName('rabbitmq:multiple-consumer')
15+
->addArgument('context', InputArgument::OPTIONAL, 'Context the consumer runs in')
16+
;
1317
}
1418

1519
protected function getConsumerService()
1620
{
1721
return 'old_sound_rabbit_mq.%s_multiple';
1822
}
19-
}
23+
24+
protected function initConsumer($input)
25+
{
26+
parent::initConsumer($input);
27+
$this->consumer->setContext($input->getArgument('context'));
28+
}
29+
}

‎Command/PurgeConsumerCommand.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Symfony\Component\Console\Input\InputInterface;
77
use Symfony\Component\Console\Input\InputOption;
88
use Symfony\Component\Console\Output\OutputInterface;
9+
use Symfony\Component\Console\Question\ConfirmationQuestion;
910

1011
/**
1112
* Command to purge a queue
@@ -32,8 +33,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
3233
$noConfirmation = (bool) $input->getOption('no-confirmation');
3334

3435
if (!$noConfirmation && $input->isInteractive()) {
35-
$confirmation = $this->getHelper('dialog')->askConfirmation($output, sprintf('<question>Are you sure you wish to purge "%s" queue? (y/n)</question>', $input->getArgument('name')), false);
36-
if (!$confirmation) {
36+
$question = new ConfirmationQuestion(
37+
sprintf(
38+
'<question>Are you sure you wish to purge "%s" queue? (y/n)</question>',
39+
$input->getArgument('name')
40+
),
41+
false
42+
);
43+
44+
if (!$this->getHelper('question')->ask($input, $output, $question)) {
3745
$output->writeln('<error>Purging cancelled!</error>');
3846

3947
return 1;

‎DependencyInjection/Configuration.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ protected function addConsumers(ArrayNodeDefinition $node)
154154
->scalarNode('callback')->isRequired()->end()
155155
->scalarNode('idle_timeout')->end()
156156
->scalarNode('idle_timeout_exit_code')->end()
157+
->arrayNode('graceful_max_execution')
158+
->canBeUnset()
159+
->children()
160+
->integerNode('timeout')->end()
161+
->integerNode('exit_code')->defaultValue(0)->end()
162+
->end()
163+
->end()
157164
->scalarNode('auto_setup_fabric')->defaultTrue()->end()
158165
->arrayNode('qos_options')
159166
->canBeUnset()

‎DependencyInjection/OldSoundRabbitMqExtension.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,16 @@ protected function loadConsumers()
201201
if (isset($consumer['idle_timeout_exit_code'])) {
202202
$definition->addMethodCall('setIdleTimeoutExitCode', array($consumer['idle_timeout_exit_code']));
203203
}
204+
if (isset($consumer['graceful_max_execution'])) {
205+
$definition->addMethodCall(
206+
'setGracefulMaxExecutionDateTimeFromSecondsInTheFuture',
207+
array($consumer['graceful_max_execution']['timeout'])
208+
);
209+
$definition->addMethodCall(
210+
'setGracefulMaxExecutionTimeoutExitCode',
211+
array($consumer['graceful_max_execution']['exit_code'])
212+
);
213+
}
204214
if (!$consumer['auto_setup_fabric']) {
205215
$definition->addMethodCall('disableAutoSetupFabric');
206216
}

‎Event/AMQPEvent.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
class AMQPEvent extends Event
1616
{
1717
const ON_CONSUME = 'on_consume';
18+
const ON_IDLE = 'on_idle';
1819
const BEFORE_PROCESSING_MESSAGE = 'before_processing';
1920
const AFTER_PROCESSING_MESSAGE = 'after_processing';
2021

‎Event/OnIdleEvent.php‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
3+
namespace OldSound\RabbitMqBundle\Event;
4+
5+
use OldSound\RabbitMqBundle\RabbitMq\Consumer;
6+
7+
/**
8+
* Class OnIdleEvent
9+
*
10+
* @package OldSound\RabbitMqBundle\Command
11+
*/
12+
class OnIdleEvent extends AMQPEvent
13+
{
14+
const NAME = AMQPEvent::ON_IDLE;
15+
16+
/**
17+
* @var bool
18+
*/
19+
private $forceStop;
20+
21+
/**
22+
* OnConsumeEvent constructor.
23+
*
24+
* @param Consumer $consumer
25+
*/
26+
public function __construct(Consumer $consumer)
27+
{
28+
$this->setConsumer($consumer);
29+
30+
$this->forceStop = true;
31+
}
32+
33+
/**
34+
* @return boolean
35+
*/
36+
public function isForceStop()
37+
{
38+
return $this->forceStop;
39+
}
40+
41+
/**
42+
* @param boolean $forceStop
43+
*/
44+
public function setForceStop($forceStop)
45+
{
46+
$this->forceStop = $forceStop;
47+
}
48+
}

‎MemoryChecker/MemoryConsumptionChecker.php‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?php
2+
3+
namespace OldSound\RabbitMqBundle\MemoryChecker;
4+
5+
/**
6+
* Help handling memory limits .
7+
*
8+
* @author Jonas Haouzi <jonas@viscaweb.com>
9+
*/
10+
class MemoryConsumptionChecker
11+
{
12+
/** @var NativeMemoryUsageProvider */
13+
private $memoryUsageProvider;
14+
15+
/**
16+
* MemoryManager constructor.
17+
*
18+
* @param NativeMemoryUsageProvider $memoryUsageProvider
19+
*/
20+
public function __construct(NativeMemoryUsageProvider $memoryUsageProvider) {
21+
$this->memoryUsageProvider = $memoryUsageProvider;
22+
}
23+
24+
/**
25+
* @param int|string $allowedConsumptionUntil
26+
* @param int|string $maxConsumptionAllowed
27+
*
28+
* @return bool
29+
*/
30+
public function isRamAlmostOverloaded($allowedConsumptionUntil, $maxConsumptionAllowed)
31+
{
32+
$allowedConsumptionUntil = $this->convertHumanUnitToNumerical($allowedConsumptionUntil);
33+
$maxConsumptionAllowed = $this->convertHumanUnitToNumerical($maxConsumptionAllowed);
34+
$currentUsage = $this->convertHumanUnitToNumerical($this->memoryUsageProvider->getMemoryUsage());
35+
36+
return $currentUsage > ($maxConsumptionAllowed - $allowedConsumptionUntil);
37+
}
38+
39+
/**
40+
* @param int|string $humanUnit
41+
*
42+
* @return int
43+
*/
44+
private function convertHumanUnitToNumerical($humanUnit)
45+
{
46+
$numerical = $humanUnit;
47+
if (!is_numeric($humanUnit)) {
48+
$numerical = substr($numerical, 0, -1);
49+
switch (substr($humanUnit, -1)) {
50+
case 'G':
51+
$numerical *= pow(1024, 3);
52+
break;
53+
case 'M':
54+
$numerical *= pow(1024, 2);
55+
break;
56+
case 'K':
57+
$numerical *= 1024;
58+
break;
59+
}
60+
}
61+
62+
return (int)$numerical;
63+
}
64+
65+
}

‎MemoryChecker/NativeMemoryUsageProvider.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
namespace OldSound\RabbitMqBundle\MemoryChecker;
4+
5+
/**
6+
* Returns the current memory PHP is using (mainly used to allow mocking).
7+
*
8+
* @author Jonas Haouzi <jonas@viscaweb.com>
9+
*/
10+
class NativeMemoryUsageProvider
11+
{
12+
/**
13+
* @return int
14+
*/
15+
public function getMemoryUsage()
16+
{
17+
return memory_get_usage(true);
18+
}
19+
}

0 commit comments

Comments
 (0)