X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFactory%2FLockFactory.php;h=0ac7525035160cecc01a169f6712a6be8ad08e03;hb=5d61599964e74bb733816a5592eee2aed3bbba4e;hp=cee01fe1e9d2647aef5fb9b8b440b0621ae4e3b6;hpb=0f32ab10d840945e82c16b03a9481302a472b90a;p=friendica.git diff --git a/src/Factory/LockFactory.php b/src/Factory/LockFactory.php index cee01fe1e9..0ac7525035 100644 --- a/src/Factory/LockFactory.php +++ b/src/Factory/LockFactory.php @@ -1,10 +1,29 @@ . + * + */ namespace Friendica\Factory; -use Friendica\Core\Cache\Cache; use Friendica\Core\Cache\IMemoryCache; -use Friendica\Core\Config\Configuration; +use Friendica\Core\Cache\Type; +use Friendica\Core\Config\IConfig; use Friendica\Core\Lock; use Friendica\Database\Database; use Psr\Log\LoggerInterface; @@ -24,7 +43,7 @@ class LockFactory const DEFAULT_DRIVER = 'default'; /** - * @var Configuration The configuration to read parameters out of the config + * @var IConfig The configuration to read parameters out of the config */ private $config; @@ -43,7 +62,7 @@ class LockFactory */ private $logger; - public function __construct(CacheFactory $cacheFactory, Configuration $config, Database $dba, LoggerInterface $logger) + public function __construct(CacheFactory $cacheFactory, IConfig $config, Database $dba, LoggerInterface $logger) { $this->cacheFactory = $cacheFactory; $this->config = $config; @@ -57,10 +76,10 @@ class LockFactory try { switch ($lock_type) { - case Cache::TYPE_MEMCACHE: - case Cache::TYPE_MEMCACHED: - case Cache::TYPE_REDIS: - case Cache::TYPE_APCU: + case Type::MEMCACHE: + case Type::MEMCACHED: + case Type::REDIS: + case Type::APCU: $cache = $this->cacheFactory->create($lock_type); if ($cache instanceof IMemoryCache) { return new Lock\CacheLock($cache); @@ -87,7 +106,7 @@ class LockFactory } /** - * @brief This method tries to find the best - local - locking method for Friendica + * This method tries to find the best - local - locking method for Friendica * * The following sequence will be tried: * 1. Semaphore Locking @@ -103,20 +122,20 @@ class LockFactory try { return new Lock\SemaphoreLock(); } catch (\Exception $exception) { - $this->logger->debug('Using Semaphore driver for locking failed.', ['exception' => $exception]); + $this->logger->warning('Using Semaphore driver for locking failed.', ['exception' => $exception]); } } // 2. Try to use Cache Locking (don't use the DB-Cache Locking because it works different!) $cache_type = $this->config->get('system', 'cache_driver', 'database'); - if ($cache_type != Cache::TYPE_DATABASE) { + if ($cache_type != Type::DATABASE) { try { $cache = $this->cacheFactory->create($cache_type); if ($cache instanceof IMemoryCache) { return new Lock\CacheLock($cache); } } catch (\Exception $exception) { - $this->logger->debug('Using Cache driver for locking failed.', ['exception' => $exception]); + $this->logger->warning('Using Cache driver for locking failed.', ['exception' => $exception]); } }