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

2
composer.json
View File

@@ -14,7 +14,7 @@
}, },
"homepage": "https://glowingblue.com", "homepage": "https://glowingblue.com",
"require": { "require": {
"flarum/core": "^1.0.0", "flarum/core": "^1.0.4",
"blomstra/flarum-redis": "^0.4.0" "blomstra/flarum-redis": "^0.4.0"
}, },
"authors": [ "authors": [

4
extend.php
View File

@@ -21,8 +21,8 @@ return [
new Extend\Locales(__DIR__.'/resources/locale'), new Extend\Locales(__DIR__.'/resources/locale'),
new EnableRedis(),
(new Extend\ServiceProvider()) (new Extend\ServiceProvider())
->register(QueueProvider::class), ->register(QueueProvider::class),
new EnableRedis()
]; ];

1144
js/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
js/package.json
View File

@@ -3,7 +3,7 @@
"version": "0.0.0", "version": "0.0.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"flarum-webpack-config": "^0.1.0-beta.10", "flarum-webpack-config": "^1.0.0",
"webpack": "^4.26.0", "webpack": "^4.26.0",
"webpack-cli": "^3.0.7" "webpack-cli": "^3.0.7"
}, },

23
src/Extend/EnableRedis.php
View File

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