Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-02 17:04:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixing force-flag for lock-releasing

Browse source
This commit is contained in:
Philipp Holzer 2019-02-24 10:08:28 +01:00
parent 9f11476ca0
commit 9b07132b80
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
6 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Core/Lock/CacheLockDriver.php
View file

@ -61,11 +61,15 @@ class CacheLockDriver extends AbstractLockDriver
/**
* (@inheritdoc)
*/
public function releaseLock($key)
public function releaseLock($key, $force = false)
{
$cachekey = self::getLockKey($key);
$this->cache->compareDelete($cachekey, getmypid());
if ($force) {
$this->cache->delete($key);
} else {
$this->cache->compareDelete($cachekey, getmypid());
}
$this->markRelease($key);
}

10
src/Core/Lock/DatabaseLockDriver.php
View file

@ -68,9 +68,15 @@ class DatabaseLockDriver extends AbstractLockDriver
/**
* (@inheritdoc)
*/
public function releaseLock($key)
public function releaseLock($key, $force = false)
{
DBA::delete('locks', ['name' => $key, 'pid' => $this->pid]);
if ($force) {
$where = ['name' => $key];
} else {
$where = ['name' => $key, 'pid' => $this->pid];
}
DBA::delete('locks', $where);
$this->markRelease($key);

5
src/Core/Lock/ILockDriver.php
View file

@ -33,11 +33,12 @@ interface ILockDriver
/**
* Releases a lock if it was set by us
*
* @param string $key The Name of the lock
* @param string $key The Name of the lock
* @param bool $force Force the lock to get released
*
* @return void
*/
public function releaseLock($key);
public function releaseLock($key, $force = false);
/**
* Releases all lock that were set by us

2
src/Core/Lock/SemaphoreLockDriver.php
View file

@ -50,7 +50,7 @@ class SemaphoreLockDriver extends AbstractLockDriver
/**
* (@inheritdoc)
*/
public function releaseLock($key)
public function releaseLock($key, $force = false)
{
if (empty(self::$semaphore[$key])) {
return false;