Memcache\Factory: Remove static, use globalPrefix.
This commit is contained in:
parent
da391b8932
commit
9be8ac5867
13
lib/base.php
13
lib/base.php
|
@ -477,9 +477,18 @@ class OC {
|
||||||
self::handleAuthHeaders();
|
self::handleAuthHeaders();
|
||||||
|
|
||||||
self::initPaths();
|
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 {
|
try {
|
||||||
self::$loader->setMemoryCache(\OC\Memcache\Factory::createLowLatency('Autoloader'));
|
$memcacheFactory = new \OC\Memcache\Factory($instanceId);
|
||||||
|
self::$loader->setMemoryCache($memcacheFactory->createLowLatency('Autoloader'));
|
||||||
} catch (\Exception $ex) {
|
} catch (\Exception $ex) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,8 @@ class Factory implements ICacheFactory {
|
||||||
* @param string $prefix
|
* @param string $prefix
|
||||||
* @return null|Cache
|
* @return null|Cache
|
||||||
*/
|
*/
|
||||||
public static function createLowLatency($prefix = '') {
|
public function createLowLatency($prefix = '') {
|
||||||
|
$prefix = $this->globalPrefix . '/' . $prefix;
|
||||||
if (XCache::isAvailable()) {
|
if (XCache::isAvailable()) {
|
||||||
return new XCache($prefix);
|
return new XCache($prefix);
|
||||||
} elseif (APCu::isAvailable()) {
|
} elseif (APCu::isAvailable()) {
|
||||||
|
@ -76,7 +77,7 @@ class Factory implements ICacheFactory {
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public static function isAvailableLowLatency() {
|
public function isAvailableLowLatency() {
|
||||||
return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable();
|
return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue