summaryrefslogtreecommitdiffstats
path: root/lib/private/Server.php
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2018-04-10 18:30:43 +0200
committerRobin Appelman <robin@icewind.nl>2018-04-11 19:21:45 +0200
commit89a9d35d90b7264d66411dfefec0aa84491d5cf9 (patch)
tree8e433546babedc20917bb0b81fa59f7438a4dfc5 /lib/private/Server.php
parent9260474ab69e85c292ac1b845a52e4ddf838d4ae (diff)
downloadnextcloud-server-89a9d35d90b7264d66411dfefec0aa84491d5cf9.tar.gz
nextcloud-server-89a9d35d90b7264d66411dfefec0aa84491d5cf9.zip
dont keep shared database locks when running cli scripts
For cli scripts we don't have the assumption that the universe will be cleaned up soon Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Server.php')
-rw-r--r--lib/private/Server.php8
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();
});