upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #58812 from nextcloud/backport/58705/stable32

Browse source 
[stable32] feat: Add memcache_customprefix
This commit is contained in:
Andy Scherzinger 2026-04-20 18:58:51 +02:00 committed by GitHub
commit d4545b10c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/config.sample.php
View file

@ -1687,6 +1687,16 @@ $CONFIG = [
*/
'memcache.distributed' => '\\OC\\Memcache\\Memcached',
/**
* Cache Key Prefix for Redis or Memcached
*
* * Used for avoiding collisions in the cache system
* * May be used for ACL restrictions in Redis
*
* Defaults to ``''`` (empty string)
*/
'memcache_customprefix' => 'mycustomprefix',
/**
* Connection details for Redis to use for memory caching in a single server configuration.
*

9
lib/private/Memcache/Factory.php
View file

@ -113,6 +113,7 @@ class Factory implements ICacheFactory {
protected function getGlobalPrefix(): string {
if ($this->globalPrefix === null) {
$config = \OCP\Server::get(SystemConfig::class);
$customprefix = $config->getValue('memcache_customprefix', '');
$maintenanceMode = $config->getValue('maintenance', false);
$versions = [];
if ($config->getValue('installed', false) && !$maintenanceMode) {
@ -129,7 +130,7 @@ class Factory implements ICacheFactory {
// Include instanceid in the prefix, in case multiple instances use the same cache (e.g. same FPM pool)
$instanceid = $config->getValue('instanceid');
$installedApps = implode(',', array_keys($versions)) . implode(',', array_values($versions));
$this->globalPrefix = hash('xxh128', $instanceid . $installedApps);
$this->globalPrefix = $customprefix . hash('xxh128', $instanceid . $installedApps);
}
return $this->globalPrefix;
}
@ -143,9 +144,11 @@ class Factory implements ICacheFactory {
public function withServerVersionPrefix(\Closure $closure): void {
$backupPrefix = $this->globalPrefix;
$config = \OCP\Server::get(SystemConfig::class);
$customprefix = $config->getValue('memcache_customprefix', '');
// Include instanceid in the prefix, in case multiple instances use the same cache (e.g. same FPM pool)
$instanceid = \OCP\Server::get(SystemConfig::class)->getValue('instanceid');
$this->globalPrefix = hash('xxh128', $instanceid . implode('.', $this->serverVersion->getVersion()));
$instanceid = $config->getValue('instanceid');
$this->globalPrefix = $customprefix . hash('xxh128', $instanceid . implode('.', $this->serverVersion->getVersion()));
$closure($this);
$this->globalPrefix = $backupPrefix;
}