Merge pull request #17662 from owncloud/locking-db

Database backend for locking

1 files changed, 5 insertions, 7 deletions

diff --git a/lib/private/server.php b/lib/private/server.php
index 5a3a6328fae..287b70eb806 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -49,6 +49,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;
@@ -441,13 +442,10 @@ class Server extends SimpleContainer implements IServerContainer {
 				/** @var \OC\Memcache\Factory $memcacheFactory */
 				$memcacheFactory = $c->getMemCacheFactory();
 				$memcache = $memcacheFactory->createLocking('lock');
-				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'
-				);
+//				if (!($memcache instanceof \OC\Memcache\NullCache)) {
+//					return new MemcacheLockingProvider($memcache);
+//				}
+				return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger());
 			}
 			return new NoopLockingProvider();
 		});