diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-09-03 11:33:10 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-09-03 11:33:10 +0200 |
| commit | a1e13d95ad3b918a608c7202c401ac3f2d0c3385 (patch) | |
| tree | 50f2d6de922e6ac0e70070953067c6f3ae2a2e26 /lib | |
| parent | c4096767ccf6a88422a474e786b8e4a398ede84e (diff) | |
| parent | 389c8077b06f166f9ad7ac2dc2063a74d9fe6738 (diff) | |
| download | nextcloud-server-a1e13d95ad3b918a608c7202c401ac3f2d0c3385.tar.gz nextcloud-server-a1e13d95ad3b918a608c7202c401ac3f2d0c3385.zip | |
Merge pull request #18777 from owncloud/locking-default
enable transational locking by default
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/server.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index a741f33eb3d..24674d2e3c7 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -451,13 +451,13 @@ class Server extends SimpleContainer implements IServerContainer { ); }); $this->registerService('LockingProvider', function (Server $c) { - if ($c->getConfig()->getSystemValue('filelocking.enabled', false) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { + if ($c->getConfig()->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { /** @var \OC\Memcache\Factory $memcacheFactory */ $memcacheFactory = $c->getMemCacheFactory(); $memcache = $memcacheFactory->createLocking('lock'); -// if (!($memcache instanceof \OC\Memcache\NullCache)) { -// return new MemcacheLockingProvider($memcache); -// } + if (!($memcache instanceof \OC\Memcache\NullCache)) { + return new MemcacheLockingProvider($memcache); + } return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger()); } return new NoopLockingProvider(); |