Skip to content

add subscription_interval as config for dbal subscription consumer #1159

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 7 additions & 10 deletions pkg/dbal/DbalContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,21 @@ class DbalContext implements Context
* Callable must return instance of Doctrine\DBAL\Connection once called.
*
* @param Connection|callable $connection
* @param array $config
*/
public function __construct($connection, array $config = [])
{
$this->config = array_replace([
'table_name' => 'enqueue',
'polling_interval' => null,
'subscription_polling_interval' => null,
], $config);

if ($connection instanceof Connection) {
$this->connection = $connection;
} elseif (is_callable($connection)) {
$this->connectionFactory = $connection;
} else {
throw new \InvalidArgumentException(sprintf(
'The connection argument must be either %s or callable that returns %s.',
Connection::class,
Connection::class
));
throw new \InvalidArgumentException(sprintf('The connection argument must be either %s or callable that returns %s.', Connection::class, Connection::class));
}
}

Expand Down Expand Up @@ -135,6 +131,10 @@ public function createSubscriptionConsumer(): SubscriptionConsumer
$consumer->setRedeliveryDelay($this->config['redelivery_delay']);
}

if (isset($this->config['subscription_polling_interval'])) {
$consumer->setPollingInterval($this->config['subscription_polling_interval']);
}

return $consumer;
}

Expand Down Expand Up @@ -202,10 +202,7 @@ public function getDbalConnection(): Connection
if (false == $this->connection) {
$connection = call_user_func($this->connectionFactory);
if (false == $connection instanceof Connection) {
throw new \LogicException(sprintf(
'The factory must return instance of Doctrine\DBAL\Connection. It returns %s',
is_object($connection) ? get_class($connection) : gettype($connection)
));
throw new \LogicException(sprintf('The factory must return instance of Doctrine\DBAL\Connection. It returns %s', is_object($connection) ? get_class($connection) : gettype($connection)));
}

$this->connection = $connection;
Expand Down
22 changes: 19 additions & 3 deletions pkg/dbal/DbalSubscriptionConsumer.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@ class DbalSubscriptionConsumer implements SubscriptionConsumer
private $redeliveryDelay;

/**
* @param DbalContext $context
* Time to wait between subscription requests in milliseconds.
*
* @var int
*/
private $pollingInterval = 200;

public function __construct(DbalContext $context)
{
$this->context = $context;
Expand All @@ -63,6 +67,18 @@ public function setRedeliveryDelay(int $redeliveryDelay): self
return $this;
}

public function getPollingInterval(): int
{
return $this->pollingInterval;
}

public function setPollingInterval(int $msec): self
{
$this->pollingInterval = $msec;

return $this;
}

public function consume(int $timeout = 0): void
{
if (empty($this->subscribers)) {
Expand Down Expand Up @@ -92,7 +108,7 @@ public function consume(int $timeout = 0): void
* @var DbalConsumer
* @var callable $callback
*/
list($consumer, $callback) = $this->subscribers[$message->getQueue()];
[$consumer, $callback] = $this->subscribers[$message->getQueue()];

if (false === call_user_func($callback, $message, $consumer)) {
return;
Expand All @@ -102,7 +118,7 @@ public function consume(int $timeout = 0): void
} else {
$currentQueueNames = [];

usleep(200000); // 200ms
usleep($this->getPollingInterval() * 1000);
}

if ($timeout && microtime(true) >= $now + $timeout) {
Expand Down
3 changes: 3 additions & 0 deletions pkg/dbal/Tests/DbalContextTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public function testCouldBeConstructedWithEmptyConfiguration()
$this->assertAttributeEquals([
'table_name' => 'enqueue',
'polling_interval' => null,
'subscription_polling_interval' => null,
], 'config', $factory);
}

Expand All @@ -47,11 +48,13 @@ public function testCouldBeConstructedWithCustomConfiguration()
$factory = new DbalContext($this->createConnectionMock(), [
'table_name' => 'theTableName',
'polling_interval' => 12345,
'subscription_polling_interval' => 12345,
]);

$this->assertAttributeEquals([
'table_name' => 'theTableName',
'polling_interval' => 12345,
'subscription_polling_interval' => 12345,
], 'config', $factory);
}

Expand Down