Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Messenger] Fix redis Connection::get() should be non blocking by default #31545

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

Merged
merged 1 commit into from
May 21, 2019
Merged

[Messenger] Fix redis Connection::get() should be non blocking by default #31545

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
20 changes: 12 additions & 8 deletions src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ public function testFromDsnWithOptions()
'host' => 'localhost',
'port' => 6379,
], [
'blocking_timeout' => 30,
'serializer' => 2,
]),
Connection::fromDsn('redis://localhost/queue/group1/consumer1', ['blocking_timeout' => 30])
Connection::fromDsn('redis://localhost/queue/group1/consumer1', ['serializer' => 2])
);
}

Expand All @@ -59,9 +59,9 @@ public function testFromDsnWithQueryOptions()
'host' => 'localhost',
'port' => 6379,
], [
'blocking_timeout' => 30,
'serializer' => 2,
]),
Connection::fromDsn('redis://localhost/queue/group1/consumer1?blocking_timeout=30')
Connection::fromDsn('redis://localhost/queue/group1/consumer1?serializer=2')
);
}

Expand Down Expand Up @@ -134,16 +134,20 @@ public function testGetAfterReject()
$redis->del('messenger-rejectthenget');
}

public function testBlockingTimeout()
public function testGetNonBlocking()
{
$redis = new \Redis();
$connection = Connection::fromDsn('redis://localhost/messenger-blockingtimeout', ['blocking_timeout' => 1], $redis);

$connection = Connection::fromDsn('redis://localhost/messenger-getnonblocking', [], $redis);
try {
$connection->setup();
} catch (TransportException $e) {
}

$this->assertNull($connection->get());
$redis->del('messenger-blockingtimeout');
$this->assertNull($connection->get()); // no message, should return null immediately
$connection->add('1', []);
$this->assertNotEmpty($message = $connection->get());
$connection->reject($message['id']);
$redis->del('messenger-getnonblocking');
}
}
7 changes: 2 additions & 5 deletions src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class Connection
private $stream;
private $group;
private $consumer;
private $blockingTimeout;
private $couldHavePendingMessages = true;

public function __construct(array $configuration, array $connectionCredentials = [], array $redisOptions = [], \Redis $redis = null)
Expand All @@ -42,7 +41,6 @@ public function __construct(array $configuration, array $connectionCredentials =
$this->stream = $configuration['stream'] ?? '' ?: 'messages';
$this->group = $configuration['group'] ?? '' ?: 'symfony';
$this->consumer = $configuration['consumer'] ?? '' ?: 'consumer';
$this->blockingTimeout = $redisOptions['blocking_timeout'] ?? null;
}

public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $redis = null): self
Expand Down Expand Up @@ -83,8 +81,7 @@ public function get(): ?array
$this->group,
$this->consumer,
[$this->stream => $messageId],
1,
$this->blockingTimeout
1
);
} catch (\RedisException $e) {
}
Expand Down Expand Up @@ -142,7 +139,7 @@ public function reject(string $id): void
}
}

public function add(string $body, array $headers)
public function add(string $body, array $headers): void
{
$e = null;
try {
Expand Down