diff options
author | Joas Schilling <coding@schilljs.com> | 2024-12-02 09:02:22 +0100 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2024-12-19 15:36:24 +0100 |
commit | e3c1eb69357fe92783fb75167f9d36f92af6113c (patch) | |
tree | 5dbd07a94756ee1b4c18737330979179350d2f50 | |
parent | fbfe30716b2fa2b3fd62d3e42703c263d8ffbea4 (diff) | |
download | nextcloud-server-backport/49588/stable29.tar.gz nextcloud-server-backport/49588/stable29.zip |
fix(setupcheck): Make the Memcache setupcheck use the cachebackport/49588/stable29
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r-- | apps/settings/lib/SetupChecks/MemcacheConfigured.php | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/apps/settings/lib/SetupChecks/MemcacheConfigured.php b/apps/settings/lib/SetupChecks/MemcacheConfigured.php index 98192f6289e..da9fbdf684c 100644 --- a/apps/settings/lib/SetupChecks/MemcacheConfigured.php +++ b/apps/settings/lib/SetupChecks/MemcacheConfigured.php @@ -25,6 +25,7 @@ declare(strict_types=1); */ namespace OCA\Settings\SetupChecks; +use OCP\ICacheFactory; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; @@ -36,6 +37,7 @@ class MemcacheConfigured implements ISetupCheck { private IL10N $l10n, private IConfig $config, private IURLGenerator $urlGenerator, + private ICacheFactory $cacheFactory, ) { } @@ -72,6 +74,41 @@ class MemcacheConfigured implements ISetupCheck { $this->urlGenerator->linkToDocs('admin-performance') ); } + + if ($this->cacheFactory->isLocalCacheAvailable()) { + $random = random_bytes(64); + $local = $this->cacheFactory->createLocal('setupcheck.local'); + try { + $local->set('test', $random); + $local2 = $this->cacheFactory->createLocal('setupcheck.local'); + $actual = $local2->get('test'); + $local->remove('test'); + } catch (\Throwable) { + $actual = null; + } + + if ($actual !== $random) { + return SetupResult::error($this->l10n->t('Failed to write and read a value from local cache.')); + } + } + + if ($this->cacheFactory->isAvailable()) { + $random = random_bytes(64); + $distributed = $this->cacheFactory->createDistributed('setupcheck'); + try { + $distributed->set('test', $random); + $distributed2 = $this->cacheFactory->createDistributed('setupcheck'); + $actual = $distributed2->get('test'); + $distributed->remove('test'); + } catch (\Throwable) { + $actual = null; + } + + if ($actual !== $random) { + return SetupResult::error($this->l10n->t('Failed to write and read a value from distributed cache.')); + } + } + return SetupResult::success($this->l10n->t('Configured')); } } |