diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-03-18 14:56:43 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-18 14:56:43 +0100 |
| commit | 917145e027adec8a7069e7b994a72d909a18dd2f (patch) | |
| tree | d9f46020f49007723a43cb1f11549a7df4e7c805 | |
| parent | 093efa458c16ea4a7f7fcaf3f98e1e0fb96624c4 (diff) | |
| parent | 917cb66a5b8871c47a4c043cb326aea21b9f1407 (diff) | |
| download | nextcloud-server-917145e027adec8a7069e7b994a72d909a18dd2f.tar.gz nextcloud-server-917145e027adec8a7069e7b994a72d909a18dd2f.zip | |
Merge pull request #14992 from owncloud/add-exception-to-memcachbe
Use ArrayCache if ownCloud is not installed
| -rw-r--r-- | lib/private/server.php | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index c55817bb6b3..4264c70905c 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -12,6 +12,7 @@ use OC\Diagnostics\NullQueryLogger; use OC\Diagnostics\EventLogger; use OC\Diagnostics\QueryLogger; use OC\Mail\Mailer; +use OC\Memcache\ArrayCache; use OC\Security\CertificateManager; use OC\Files\Node\Root; use OC\Files\View; @@ -159,17 +160,25 @@ class Server extends SimpleContainer implements IServerContainer { $this->registerService('UserCache', function ($c) { return new UserCache(); }); - $this->registerService('MemCacheFactory', function ($c) { + $this->registerService('MemCacheFactory', function (Server $c) { $config = $c->getConfig(); - $v = \OC_App::getAppVersions(); - $v['core'] = implode('.', \OC_Util::getVersion()); - $version = implode(',', $v); - $instanceId = \OC_Util::getInstanceId(); - $path = \OC::$SERVERROOT; - $prefix = md5($instanceId.'-'.$version.'-'.$path); - return new \OC\Memcache\Factory($prefix, - $config->getSystemValue('memcache.local', null), - $config->getSystemValue('memcache.distributed', null) + + if($config->getSystemValue('installed', false)) { + $v = \OC_App::getAppVersions(); + $v['core'] = implode('.', \OC_Util::getVersion()); + $version = implode(',', $v); + $instanceId = \OC_Util::getInstanceId(); + $path = \OC::$SERVERROOT; + $prefix = md5($instanceId.'-'.$version.'-'.$path); + return new \OC\Memcache\Factory($prefix, + $config->getSystemValue('memcache.local', null), + $config->getSystemValue('memcache.distributed', null) + ); + } + + return new \OC\Memcache\Factory('', + new ArrayCache(), + new ArrayCache() ); }); $this->registerService('ActivityManager', function ($c) { |