diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 13 | ||||
| -rw-r--r-- | lib/private/memcache/factory.php | 5 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lib/base.php b/lib/base.php index be0955090e0..e8565749425 100644 --- a/lib/base.php +++ b/lib/base.php @@ -477,9 +477,18 @@ class OC { self::handleAuthHeaders(); self::initPaths(); - if (OC_Config::getValue('instanceid', false)) { + + // The class loader takes an optional low-latency cache, which MUST be + // namespaced. The instanceid is used for namespacing, but might be + // unavailable at this point. Futhermore, it might not be possible to + // generate an instanceid via \OC_Util::getInstanceId() because the + // config file may not be writable. As such, we only register a class + // loader cache if instanceid is available without trying to create one. + $instanceId = OC_Config::getValue('instanceid', null); + if ($instanceId) { try { - self::$loader->setMemoryCache(\OC\Memcache\Factory::createLowLatency('Autoloader')); + $memcacheFactory = new \OC\Memcache\Factory($instanceId); + self::$loader->setMemoryCache($memcacheFactory->createLowLatency('Autoloader')); } catch (\Exception $ex) { } } diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php index d60b157efe2..8e47a8899fc 100644 --- a/lib/private/memcache/factory.php +++ b/lib/private/memcache/factory.php @@ -59,7 +59,8 @@ class Factory implements ICacheFactory { * @param string $prefix * @return null|Cache */ - public static function createLowLatency($prefix = '') { + public function createLowLatency($prefix = '') { + $prefix = $this->globalPrefix . '/' . $prefix; if (XCache::isAvailable()) { return new XCache($prefix); } elseif (APCu::isAvailable()) { @@ -76,7 +77,7 @@ class Factory implements ICacheFactory { * * @return bool */ - public static function isAvailableLowLatency() { + public function isAvailableLowLatency() { return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable(); } |