clone/flarum-ext-redis-setup
1
0
Fork 1
mirror of https://github.com/glowingblue/flarum-ext-redis-setup.git synced 2026-03-22 06:57:45 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Address failure when only running selected redis services

Browse Source
This commit is contained in:
Ian Morland
2021-07-01 21:23:57 +01:00
parent ed83a0123d
commit 68a5cafdfc
5 changed files with 594 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Extend/EnableRedis.php
View File

@@ -18,10 +18,15 @@ class EnableRedis implements ExtenderInterface
public function extend(Container $container, Extension $extension = null)
{
$config = $this->buildConfig();
$disabled = $this->getDisabledServices();
if (Arr::hasAny($config, [self::CACHE_KEY, self::QUEUE_KEY, self::SESSION_KEY])) {
(new Redis($config))->disable($this->getDisabledServices())->extend($container, $extension);
$redis = (new Redis($config));
foreach ($disabled as $service) {
$redis->disable($service);
}
$redis->extend($container, $extension);
}
private function getDisabledServices(): array
@@ -42,7 +47,7 @@ class EnableRedis implements ExtenderInterface
if (!(bool) $settings->get('glowingblue-redis.redisSessions', false)) {
$disabled[] = 'session';
}
return $disabled;
}
@@ -59,6 +64,7 @@ class EnableRedis implements ExtenderInterface
'password' => $this->getPassword(),
'port' => $this->getPort(),
'database' => $this->getCacheDatabase(),
'prefix' => $this->getPrefix(),
];
$queue = [
@@ -66,6 +72,7 @@ class EnableRedis implements ExtenderInterface
'password' => $this->getPassword(),
'port' => $this->getPort(),
'database' => $this->getQueueDatabase(),
'prefix' => $this->getPrefix(),
];
$session = [
@@ -73,6 +80,7 @@ class EnableRedis implements ExtenderInterface
'password' => $this->getPassword(),
'port' => $this->getPort(),
'database' => $this->getSessionDatabase(),
'prefix' => $this->getPrefix(),
];
$config = Arr::add($config, self::CACHE_KEY, $cache);
@@ -82,9 +90,9 @@ class EnableRedis implements ExtenderInterface
return $config;
}
private function getHost(): ?string
private function getHost(): string
{
return getenv('REDIS_HOST') ? getenv('REDIS_HOST') : null;
return getenv('REDIS_HOST') ? getenv('REDIS_HOST') : '127.0.0.1';
}
private function getPassword(): ?string
@@ -111,4 +119,9 @@ class EnableRedis implements ExtenderInterface
{
return (int) getenv('REDIS_DATABASE_SESSION') ? getenv('REDIS_DATABASE_SESSION') : 3;
}
private function getPrefix(): string
{
return getenv('REDIS_PREFIX') ? getenv('REDIS_PREFIX') : 'flarum_';
}
}