diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-07-15 15:21:07 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-07-15 22:53:14 +0100 |
| commit | 7830434d784ee85507a53499906cee8dbc232ae1 (patch) | |
| tree | 469bb452f971fb577f2163271cbc763c13ec0a9e /lib/private/server.php | |
| parent | e46ec4a6b6fd48cf7684daa1e2d6b266162600c6 (diff) | |
| download | nextcloud-server-7830434d784ee85507a53499906cee8dbc232ae1.tar.gz nextcloud-server-7830434d784ee85507a53499906cee8dbc232ae1.zip | |
Missing memcache should not cause occ hard-fail
Warning is now printed to logs, but occ and cron will still work.
Diffstat (limited to 'lib/private/server.php')
| -rw-r--r-- | lib/private/server.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index 84141fe28c1..a3043f943ca 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -234,14 +234,14 @@ class Server extends SimpleContainer implements IServerContainer { $instanceId = \OC_Util::getInstanceId(); $path = \OC::$SERVERROOT; $prefix = md5($instanceId.'-'.$version.'-'.$path); - return new \OC\Memcache\Factory($prefix, + return new \OC\Memcache\Factory($prefix, $c->getLogger(), $config->getSystemValue('memcache.local', null), $config->getSystemValue('memcache.distributed', null), $config->getSystemValue('memcache.locking', null) ); } - return new \OC\Memcache\Factory('', + return new \OC\Memcache\Factory('', $c->getLogger(), new ArrayCache(), new ArrayCache(), new ArrayCache() |