From cd4c064ebf13218ce43940928041efac4c5f46ad Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 18 Feb 2015 14:16:14 +0100
Subject: [PATCH] Revert "add debug log for memcache instantiation"
---
lib/base.php | 3 +--
lib/private/memcache/factory.php | 22 +++++-----------------
lib/private/server.php | 3 +--
3 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index cdc662c28d9..87eb746ff4b 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -727,8 +727,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) {
}
diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php
index 537054a30f6..e8a91c52269 100644
--- a/lib/private/memcache/factory.php
+++ b/lib/private/memcache/factory.php
@@ -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();
}
+
}
diff --git a/lib/private/server.php b/lib/private/server.php
index 7c7f3c25cc8..5eaecc00932 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -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();
--
GitLab