Rename dbesc to DBA::escape

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

diff --git a/src/Core/Lock.php b/src/Core/Lock.php
index 7235c64..9892f1f 100644 (file)
--- a/src/Core/Lock.php
+++ b/src/Core/Lock.php
@@ -1,7 +1,5 @@
 <?php
-/**
- * @file src/Util/Lock.php
- */
+
 namespace Friendica\Core;
 
 /**
@@ -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);
                                        }
@@ -127,7 +113,7 @@ class Lock
         *
         * @return boolean Was the lock successful?
         */
-       public static function acquireLock($key, $timeout = 120)
+       public static function acquire($key, $timeout = 120)
        {
                return self::getDriver()->acquireLock($key, $timeout);
        }
@@ -136,11 +122,11 @@ class Lock
         * @brief Releases a lock if it was set by us
         *
         * @param string $key Name of the lock
-        * @return mixed
+        * @return void
         */
-       public static function releaseLock($key)
+       public static function release($key)
        {
-               return self::getDriver()->releaseLock($key);
+               self::getDriver()->releaseLock($key);
        }
 
        /**