diff options
author | Robin Appelman <icewind@owncloud.com> | 2015-07-15 16:14:48 +0200 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2015-08-03 14:13:36 +0200 |
commit | 86acd535c243569fda7c1a2957073509c7e94f89 (patch) | |
tree | 9a0faa5e294efd3bac8cf257ea10d0fd8da86949 /lib | |
parent | 4ea7cbb0f5d97b0ae5fe8a6c3c43718d3fa5172e (diff) | |
download | nextcloud-server-86acd535c243569fda7c1a2957073509c7e94f89.tar.gz nextcloud-server-86acd535c243569fda7c1a2957073509c7e94f89.zip |
use the database backend for locking if no memcache is configured for it
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/server.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index 12981fe7f19..51e70405432 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -48,6 +48,7 @@ use OC\Diagnostics\QueryLogger; use OC\Files\Node\Root; use OC\Files\View; use OC\Http\Client\ClientService; +use OC\Lock\DBLockingProvider; use OC\Lock\MemcacheLockingProvider; use OC\Lock\NoopLockingProvider; use OC\Mail\Mailer; @@ -434,10 +435,7 @@ class Server extends SimpleContainer implements IServerContainer { if (!($memcache instanceof \OC\Memcache\NullCache)) { return new MemcacheLockingProvider($memcache); } - throw new HintException( - 'File locking is enabled but the locking cache class was not found', - 'Please check the "memcache.locking" setting and make sure the matching PHP module is installed and enabled' - ); + return new DBLockingProvider($c->getDatabaseConnection()); } return new NoopLockingProvider(); }); |