mirror of
https://github.com/glowingblue/flarum-ext-redis-setup.git
synced 2026-03-22 06:57:45 +01:00
chore: migrate to fof/redis, repo maintenance (#4)
* chore: migrate to fof/redis, repo maintenance * chore: newline * chore: use new fof horizon initializer * chore: revert initializer change Only changed for 2.x .. * chore: remove unused secrets Shouldn't have been added in the first place --------- Co-authored-by: Davide Iadeluca <146922689+DavideIadeluca@users.noreply.github.com> Co-authored-by: Davide Iadeluca <davide.iadeluca@glowingblue.com>
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
|
||||
namespace GlowingBlue\RedisSetup\Extend;
|
||||
|
||||
use Blomstra\Horizon\Extend\Horizon;
|
||||
use FoF\Horizon\Extend\Horizon;
|
||||
use Flarum\Extend\ExtenderInterface;
|
||||
use Flarum\Extension\Extension;
|
||||
use Flarum\Extension\ExtensionManager;
|
||||
@@ -25,7 +25,7 @@ class ConfigureHorizon implements ExtenderInterface
|
||||
{
|
||||
$extensions = resolve(ExtensionManager::class);
|
||||
|
||||
if (!$extensions->isEnabled('blomstra-horizon') || !class_exists(Horizon::class)) {
|
||||
if (!$extensions->isEnabled('fof-horizon') || !class_exists(Horizon::class)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
namespace GlowingBlue\RedisSetup\Extend;
|
||||
|
||||
use Blomstra\Redis\Extend\Redis;
|
||||
use FoF\Redis\Extend\Redis;
|
||||
use Flarum\Extend\ExtenderInterface;
|
||||
use Flarum\Extension\Extension;
|
||||
use Flarum\Settings\SettingsRepositoryInterface;
|
||||
@@ -30,8 +30,7 @@ class EnableRedis implements ExtenderInterface
|
||||
$config = $this->buildConfig();
|
||||
|
||||
(new Redis($config))
|
||||
->disable($this->getDisabledServices())
|
||||
->extend($container, $extension);
|
||||
->disable($this->getDisabledServices());
|
||||
}
|
||||
|
||||
private function getDisabledServices(): array
|
||||
|
||||
@@ -55,7 +55,7 @@ class QueueProvider extends AbstractServiceProvider
|
||||
/** @var QueueContract $queue */
|
||||
$queue = resolve(QueueContract::class);
|
||||
|
||||
$queues = $cache->get('blomstra.queue.queues-seen') ?? [];
|
||||
$queues = $cache->get('fof.queue.queues-seen') ?? [];
|
||||
|
||||
if ($queue instanceof RedisQueue) {
|
||||
$load = [];
|
||||
@@ -67,8 +67,8 @@ class QueueProvider extends AbstractServiceProvider
|
||||
}
|
||||
}
|
||||
|
||||
$document->payload['blomstraQueuesSeen'] = $queues;
|
||||
$document->payload['blomstraQueuesLoad'] = $load ?? null;
|
||||
$document->payload['fofQueuesSeen'] = $queues;
|
||||
$document->payload['fofQueuesLoad'] = $load ?? null;
|
||||
}
|
||||
|
||||
public function trackQueues(Looping $event)
|
||||
@@ -76,8 +76,8 @@ class QueueProvider extends AbstractServiceProvider
|
||||
/** @var Store $cache */
|
||||
$cache = resolve('cache.store');
|
||||
|
||||
$queues = $cache->get('blomstra.queue.queues-seen') ?? [];
|
||||
$queues = $cache->get('fof.queue.queues-seen') ?? [];
|
||||
$queues = array_merge($queues, (array) explode(',', $event->queue));
|
||||
$cache->put('blomstra.queue.queues-seen', array_unique($queues), 60);
|
||||
$cache->put('fof.queue.queues-seen', array_unique($queues), 60);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user