diff options
| author | Robin Appelman <robin@icewind.nl> | 2018-04-12 12:09:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 12:09:43 +0200 |
| commit | fb34ef10936fc5a3cb3d238cc6c7029dbc6a0f4a (patch) | |
| tree | 1deb7853ac6eecf9f598f23e5d8aba6414852cb5 /lib/private/Server.php | |
| parent | e275b9a2cf8cba45a484265c7f4998b6056d699f (diff) | |
| parent | 89a9d35d90b7264d66411dfefec0aa84491d5cf9 (diff) | |
| download | nextcloud-server-fb34ef10936fc5a3cb3d238cc6c7029dbc6a0f4a.tar.gz nextcloud-server-fb34ef10936fc5a3cb3d238cc6c7029dbc6a0f4a.zip | |
Merge pull request #9134 from nextcloud/db-locks-cli
dont keep shared database locks when running cli scripts
Diffstat (limited to 'lib/private/Server.php')
| -rw-r--r-- | lib/private/Server.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index 109fb002ce5..fd32b09033e 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -847,7 +847,13 @@ class Server extends ServerContainer implements IServerContainer { if (!($memcache instanceof \OC\Memcache\NullCache)) { return new MemcacheLockingProvider($memcache, $ttl); } - return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl); + return new DBLockingProvider( + $c->getDatabaseConnection(), + $c->getLogger(), + new TimeFactory(), + $ttl, + !\OC::$CLI + ); } return new NoopLockingProvider(); }); |