Restructure Cache to follow new paradigm

[friendica.git] / src / Factory / LockFactory.php

diff --git a/src/Factory/LockFactory.php b/src/Factory/LockFactory.php
index fef6708d21aad174c415311cd421cccc59bb8e0e..2a54910d45f0ba5482c22308af7c2587893c8836 100644 (file)
--- a/src/Factory/LockFactory.php
+++ b/src/Factory/LockFactory.php
@@ -1,13 +1,32 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Factory;
 
-use Friendica\Core\Cache\Cache;
+use Friendica\Core\Cache\Factory\CacheFactory;
 use Friendica\Core\Cache\IMemoryCache;
-use Friendica\Core\Config\Configuration;
+use Friendica\Core\Cache\Enum\Type;
+use Friendica\Core\Config\IConfig;
 use Friendica\Core\Lock;
 use Friendica\Database\Database;
-use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -25,7 +44,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;
 
@@ -39,17 +58,12 @@ class LockFactory
         */
        private $cacheFactory;
 
-       /**
-        * @var Profiler The optional profiler if the cached should be profiled
-        */
-       private $profiler;
-
        /**
         * @var LoggerInterface The Friendica Logger
         */
        private $logger;
 
-       public function __construct(CacheFactory $cacheFactory, Configuration $config, Database $dba, Profiler $profiler, LoggerInterface $logger)
+       public function __construct(CacheFactory $cacheFactory, IConfig $config, Database $dba, LoggerInterface $logger)
        {
                $this->cacheFactory = $cacheFactory;
                $this->config       = $config;
@@ -63,10 +77,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);
@@ -93,7 +107,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
@@ -109,20 +123,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]);
                        }
                }