clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Restructure Lock to follow new paradigm

Browse Source
This commit is contained in:
Philipp
2021-10-23 11:36:37 +02:00
parent ab83d0dd27
commit ff1a812e1a
14 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Lock/Type.php → src/Core/Lock/Enum/Type.php
View File

@@ -19,7 +19,7 @@
*
*/
namespace Friendica\Core\Lock;
namespace Friendica\Core\Lock\Enum;
use Friendica\Core\Cache\Enum\Type as CacheType;

14
src/Factory/LockFactory.php → src/Core/Lock/Factory/LockFactory.php
View File

@@ -19,7 +19,7 @@
*
*/
namespace Friendica\Factory;
namespace Friendica\Core\Lock\Factory;
use Friendica\Core\Cache\Factory\CacheFactory;
use Friendica\Core\Cache\IMemoryCache;
@@ -83,18 +83,18 @@ class LockFactory
case Type::APCU:
$cache = $this->cacheFactory->create($lock_type);
if ($cache instanceof IMemoryCache) {
return new Lock\CacheLock($cache);
return new Lock\Type\CacheLock($cache);
} else {
throw new \Exception(sprintf('Incompatible cache driver \'%s\' for lock used', $lock_type));
}
break;
case 'database':
return new Lock\DatabaseLock($this->dba);
return new Lock\Type\DatabaseLock($this->dba);
break;
case 'semaphore':
return new Lock\SemaphoreLock();
return new Lock\Type\SemaphoreLock();
break;
default:
@@ -121,7 +121,7 @@ class LockFactory
// 1. Try to use Semaphores for - local - locking
if (function_exists('sem_get')) {
try {
return new Lock\SemaphoreLock();
return new Lock\Type\SemaphoreLock();
} catch (\Exception $exception) {
$this->logger->warning('Using Semaphore driver for locking failed.', ['exception' => $exception]);
}
@@ -133,7 +133,7 @@ class LockFactory
try {
$cache = $this->cacheFactory->create($cache_type);
if ($cache instanceof IMemoryCache) {
return new Lock\CacheLock($cache);
return new Lock\Type\CacheLock($cache);
}
} catch (\Exception $exception) {
$this->logger->warning('Using Cache driver for locking failed.', ['exception' => $exception]);
@@ -141,6 +141,6 @@ class LockFactory
}
// 3. Use Database Locking as a Fallback
return new Lock\DatabaseLock($this->dba);
return new Lock\Type\DatabaseLock($this->dba);
}
}

2
src/Core/BaseLock.php → src/Core/Lock/Type/BaseLock.php
View File

@@ -19,7 +19,7 @@
*
*/
namespace Friendica\Core;
namespace Friendica\Core\Lock\Type;
use Friendica\Core\Lock\ILock;

3
src/Core/Lock/CacheLock.php → src/Core/Lock/Type/CacheLock.php
View File

@@ -19,9 +19,8 @@
*
*/
namespace Friendica\Core\Lock;
namespace Friendica\Core\Lock\Type;
use Friendica\Core\BaseLock;
use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Cache\IMemoryCache;

4
src/Core/Lock/DatabaseLock.php → src/Core/Lock/Type/DatabaseLock.php
View File

@@ -19,10 +19,10 @@
*
*/
namespace Friendica\Core\Lock;
namespace Friendica\Core\Lock\Type;
use Friendica\Core\BaseLock;
use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Lock\Enum\Type;
use Friendica\Database\Database;
use Friendica\Util\DateTimeFormat;

5
src/Core/Lock/SemaphoreLock.php → src/Core/Lock/Type/SemaphoreLock.php
View File

@@ -19,10 +19,11 @@
*
*/
namespace Friendica\Core\Lock;
namespace Friendica\Core\Lock\Type;
use Friendica\Core\BaseLock;
use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Lock\Enum\Type;
use function get_temppath;
class SemaphoreLock extends BaseLock
{