Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 23:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring DBA-mocking tests

Browse source 
- Reducing DB-dependencies
- Creating DB-cache mocks
- Creating DB-lock mocks
- Switching to mocked dependencies for Cache/Lock/App
This commit is contained in:
Philipp Holzer 2019-01-30 20:26:17 +01:00
parent f7e95f65b1
commit 433d6abe8c
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
21 changed files with 848 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,21 @@ use Friendica\Util\DateTimeFormat;
*/
class DatabaseLockDriver extends AbstractLockDriver
{
/**
* The current ID of the process
*
* @var int
*/
private $pid;
/**
* @param null|int $pid The Id of the current process (null means determine automatically)
*/
public function __construct($pid = null)
{
$this->pid = isset($pid) ? $pid : getmypid();
}
/**
* (@inheritdoc)
*/
@ -26,16 +41,16 @@ class DatabaseLockDriver extends AbstractLockDriver
if (DBA::isResult($lock)) {
if ($lock['locked']) {
// We want to lock something that was already locked by us? So we got the lock.
if ($lock['pid'] == getmypid()) {
if ($lock['pid'] == $this->pid) {
$got_lock = true;
}
}
if (!$lock['locked']) {
DBA::update('locks', ['locked' => true, 'pid' => getmypid(), 'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds')], ['name' => $key]);
DBA::update('locks', ['locked' => true, 'pid' => $this->pid, 'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds')], ['name' => $key]);
$got_lock = true;
}
} else {
DBA::insert('locks', ['name' => $key, 'locked' => true, 'pid' => getmypid(), 'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds')]);
DBA::insert('locks', ['name' => $key, 'locked' => true, 'pid' => $this->pid, 'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds')]);
$got_lock = true;
$this->markAcquire($key);
}
@ -55,7 +70,7 @@ class DatabaseLockDriver extends AbstractLockDriver
*/
public function releaseLock($key)
{
DBA::delete('locks', ['name' => $key, 'pid' => getmypid()]);
DBA::delete('locks', ['name' => $key, 'pid' => $this->pid]);
$this->markRelease($key);
@ -67,7 +82,7 @@ class DatabaseLockDriver extends AbstractLockDriver
*/
public function releaseAll()
{
DBA::delete('locks', ['pid' => getmypid()]);
DBA::delete('locks', ['pid' => $this->pid]);
$this->acquiredLocks = [];
}