wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcache_instantiation

Browse source 
Revert "add debug log for memcache instantiation"
This commit is contained in:
Lukas Reschke 2015-02-18 15:45:38 +01:00
commit e4bf3fcb53
3 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/base.php
View file

@ -728,8 +728,7 @@ class OC {
$instanceId = \OC::$server->getSystemConfig()->getValue('instanceid', null);
if ($instanceId) {
try {
$memcacheFactory = new \OC\Memcache\Factory($instanceId,
\OC::$server->getLogger());
$memcacheFactory = new \OC\Memcache\Factory($instanceId);
self::$loader->setMemoryCache($memcacheFactory->createLowLatency('Autoloader'));
} catch (\Exception $ex) {
}

22
lib/private/memcache/factory.php
View file

@ -11,19 +11,16 @@ namespace OC\Memcache;
use \OCP\ICacheFactory;
class Factory implements ICacheFactory {
/** @var string $globalPrefix */
/**
* @var string $globalPrefix
*/
private $globalPrefix;
/** @var \OCP\ILogger */
private $logger;
/**
* @param string $globalPrefix
* @param \OCP\ILogger $logger
*/
public function __construct($globalPrefix, $logger) {
public function __construct($globalPrefix) {
$this->globalPrefix = $globalPrefix;
$this->logger = $logger;
}
/**
@ -35,22 +32,16 @@ class Factory implements ICacheFactory {
function create($prefix = '') {
$prefix = $this->globalPrefix . '/' . $prefix;
if (XCache::isAvailable()) {
$this->logger->debug("creating XCache instance", array('app' => 'memcache'));
return new XCache($prefix);
} elseif (APCu::isAvailable()) {
$this->logger->debug('creating APCu instance', array('app'=>'memcache'));
return new APCu($prefix);
} elseif (APC::isAvailable()) {
$this->logger->debug('creating APC instance', array('app'=>'memcache'));
return new APC($prefix);
} elseif (Redis::isAvailable()) {
$this->logger->debug('creating redis instance', array('app'=>'memcache'));
return new Redis($prefix);
} elseif (Memcached::isAvailable()) {
$this->logger->debug('creating memcached instance', array('app'=>'memcache'));
return new Memcached($prefix);
} else {
$this->logger->debug('no cache available instance', array('app'=>'memcache'));
return new ArrayCache($prefix);
}
}
@ -73,16 +64,12 @@ class Factory implements ICacheFactory {
public function createLowLatency($prefix = '') {
$prefix = $this->globalPrefix . '/' . $prefix;
if (XCache::isAvailable()) {
$this->logger->debug('creating xcache instance for low latency', array('app'=>'memcache'));
return new XCache($prefix);
} elseif (APCu::isAvailable()) {
$this->logger->debug('creating APCu instance for low latency', array('app'=>'memcache'));
return new APCu($prefix);
} elseif (APC::isAvailable()) {
$this->logger->debug('creating APC instance for low latency', array('app'=>'memcache'));
return new APC($prefix);
} else {
$this->logger->debug('no low latency cache available', array('app'=>'memcache'));
return null;
}
}
@ -96,4 +83,5 @@ class Factory implements ICacheFactory {
return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable();
}
}

3
lib/private/server.php
View file

@ -155,8 +155,7 @@ class Server extends SimpleContainer implements IServerContainer {
});
$this->registerService('MemCacheFactory', function ($c) {
$instanceId = \OC_Util::getInstanceId();
$logger = $c['Logger'];
return new \OC\Memcache\Factory($instanceId, $logger);
return new \OC\Memcache\Factory($instanceId);
});
$this->registerService('ActivityManager', function ($c) {
return new ActivityManager();