wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove all locks after ttl from the db

Browse source
This commit is contained in:
Robin Appelman 2015-12-09 14:13:05 +01:00
parent 5c95939bf3
commit e191953942
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/lock/dblockingprovider.php
View file

@ -235,10 +235,10 @@ class DBLockingProvider extends AbstractLockingProvider {
/**
* cleanup empty locks
*/
public function cleanEmptyLocks() {
public function cleanExpiredLocks() {
$expire = $this->timeFactory->getTime();
$this->connection->executeUpdate(
'DELETE FROM `*PREFIX*file_locks` WHERE `lock` = 0 AND `ttl` < ?',
'DELETE FROM `*PREFIX*file_locks` WHERE `ttl` < ?',
[$expire]
);
}
@ -262,7 +262,7 @@ class DBLockingProvider extends AbstractLockingProvider {
public function __destruct() {
try {
$this->cleanEmptyLocks();
$this->cleanExpiredLocks();
} catch (\Exception $e) {
// If the table is missing, the clean up was successful
if ($this->connection->tableExists('file_locks')) {

8
tests/lib/lock/dblockingprovider.php
View file

@ -85,13 +85,7 @@ class DBLockingProvider extends LockingProvider {
$this->assertEquals(3, $this->getLockEntryCount());
$this->instance->cleanEmptyLocks();
$this->assertEquals(3, $this->getLockEntryCount());
$this->instance->releaseAll();
$this->instance->cleanEmptyLocks();
$this->instance->cleanExpiredLocks();
$this->assertEquals(2, $this->getLockEntryCount());
}