diff options
| author | Robin Appelman <icewind@owncloud.com> | 2015-09-02 16:55:37 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2015-09-02 16:56:47 +0200 |
| commit | 4880d7729bf6442280be71ce91771ef3e077c54c (patch) | |
| tree | 2c8a2c8b0a43f727283ba9b12d10dbc6aa15933e /lib | |
| parent | f97359706a407a876643026cb608e4d5dd319d29 (diff) | |
| download | nextcloud-server-4880d7729bf6442280be71ce91771ef3e077c54c.tar.gz nextcloud-server-4880d7729bf6442280be71ce91771ef3e077c54c.zip | |
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(); |