Clarified description

[friendica.git] / src / Core / Lock.php

diff --git a/src/Core/Lock.php b/src/Core/Lock.php
index 7235c64a982aa3a9e2ec1e6f35f013652655a9ea..a45490bf3966065990476741e64340910bb78582 100644 (file)
--- a/src/Core/Lock.php
+++ b/src/Core/Lock.php
@@ -1,15 +1,13 @@
 <?php
-/**
- * @file src/Util/Lock.php
- */
-namespace Friendica\Core;
 
 /**
  * @file src/Core/Lock.php
  * @brief Functions for preventing parallel execution of functions
  */
 
-use Friendica\Core\Cache\CacheDriverFactory;
+namespace Friendica\Core;
+
+use Friendica\Factory\CacheDriverFactory;
 use Friendica\Core\Cache\IMemoryCacheDriver;
 
 /**
@@ -29,21 +27,9 @@ class Lock
                try {
                        switch ($lock_driver) {
                                case 'memcache':
-                                       $cache_driver = CacheDriverFactory::create('memcache');
-                                       if ($cache_driver instanceof IMemoryCacheDriver) {
-                                               self::$driver = new Lock\CacheLockDriver($cache_driver);
-                                       }
-                                       break;
-
                                case 'memcached':
-                                       $cache_driver = CacheDriverFactory::create('memcached');
-                                       if ($cache_driver instanceof IMemoryCacheDriver) {
-                                               self::$driver = new Lock\CacheLockDriver($cache_driver);
-                                       }
-                                       break;
-
                                case 'redis':
-                                       $cache_driver = CacheDriverFactory::create('redis');
+                                       $cache_driver = CacheDriverFactory::create($lock_driver);
                                        if ($cache_driver instanceof IMemoryCacheDriver) {
                                                self::$driver = new Lock\CacheLockDriver($cache_driver);
                                        }
@@ -61,7 +47,7 @@ class Lock
                                        self::useAutoDriver();
                        }
                } catch (\Exception $exception) {
-                       logger ('Driver \'' . $lock_driver . '\' failed - Fallback to \'useAutoDriver()\'');
+                       Logger::log('Driver \'' . $lock_driver . '\' failed - Fallback to \'useAutoDriver()\'');
                        self::useAutoDriver();
                }
        }
@@ -83,7 +69,7 @@ class Lock
                                self::$driver = new Lock\SemaphoreLockDriver();
                                return;
                        } catch (\Exception $exception) {
-                               logger ('Using Semaphore driver for locking failed: ' . $exception->getMessage());
+                               Logger::log('Using Semaphore driver for locking failed: ' . $exception->getMessage());
                        }
                }
 
@@ -97,7 +83,7 @@ class Lock
                                }
                                return;
                        } catch (\Exception $exception) {
-                               logger('Using Cache driver for locking failed: ' . $exception->getMessage());
+                               Logger::log('Using Cache driver for locking failed: ' . $exception->getMessage());
                        }
                }
 
@@ -124,23 +110,25 @@ class Lock
         *
         * @param string  $key Name of the lock
         * @param integer $timeout Seconds until we give up
+        * @param integer $ttl The Lock lifespan, must be one of the Cache constants
         *
         * @return boolean Was the lock successful?
         */
-       public static function acquireLock($key, $timeout = 120)
+       public static function acquire($key, $timeout = 120, $ttl = Cache::FIVE_MINUTES)
        {
-               return self::getDriver()->acquireLock($key, $timeout);
+               return self::getDriver()->acquireLock($key, $timeout, $ttl);
        }
 
        /**
         * @brief Releases a lock if it was set by us
         *
-        * @param string $key Name of the lock
-        * @return mixed
+        * @param string $key      Name of the lock
+        * @param bool   $override Overrides the lock to get releases
+        * @return void
         */
-       public static function releaseLock($key)
+       public static function release($key, $override = false)
        {
-               return self::getDriver()->releaseLock($key);
+               self::getDriver()->releaseLock($key, $override);
        }
 
        /**