Skip to content

Fix for using RedisCluster in CacheSequenceResolver.php #16

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

Closed
rzv-me wants to merge 1 commit into from
Closed

Fix for using RedisCluster in CacheSequenceResolver.php #16

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
17 changes: 9 additions & 8 deletions src/SequenceResolvers/CacheSequenceResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Illuminate\Contracts\Cache\Repository;
use Illuminate\Redis\Connections\PhpRedisConnection;
use Redis;
use RedisCluster;

class CacheSequenceResolver implements ResolvesSequences
{
Expand Down Expand Up @@ -48,36 +49,36 @@ protected function withoutSerializationOrCompression(callable $callback)

$old_serializer = null;
if ($this->serialized($client)) {
$old_serializer = $client->getOption($client::OPT_SERIALIZER);
$client->setOption($client::OPT_SERIALIZER, $client::SERIALIZER_NONE);
$old_serializer = $client->getOption(Redis::OPT_SERIALIZER);
$client->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);
}

$old_compressor = null;
if ($this->compressed($client)) {
$old_compressor = $client->getOption($client::OPT_COMPRESSION);
$client->setOption($client::OPT_COMPRESSION, $client::COMPRESSION_NONE);
$old_compressor = $client->getOption(Redis::OPT_COMPRESSION);
$client->setOption(Redis::OPT_COMPRESSION, Redis::COMPRESSION_NONE);
}

try {
return $callback();
} finally {
if (null !== $old_serializer) {
$client->setOption($client::OPT_SERIALIZER, $old_serializer);
$client->setOption(Redis::OPT_SERIALIZER, $old_serializer);
}

if (null !== $old_compressor) {
$client->setOption($client::OPT_COMPRESSION, $old_compressor);
$client->setOption(Redis::OPT_COMPRESSION, $old_compressor);
}
}
}

public function serialized(Redis $client): bool
public function serialized(Redis|RedisCluster $client): bool
{
return defined('Redis::OPT_SERIALIZER')
&& $client->getOption(Redis::OPT_SERIALIZER) !== Redis::SERIALIZER_NONE;
}

public function compressed(Redis $client): bool
public function compressed(Redis|RedisCluster $client): bool
{
return defined('Redis::OPT_COMPRESSION')
&& $client->getOption(Redis::OPT_COMPRESSION) !== Redis::COMPRESSION_NONE;
Expand Down