Merge pull request #6637 from annando/fix-jpm

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

diff --git a/src/Core/Lock.php b/src/Core/Lock.php
index 9892f1f4e4d7e74e2dcab9212da8a09f4943401f..e8c8a7041605b0826be5912722f7e9b75629de5d 100644 (file)
--- a/src/Core/Lock.php
+++ b/src/Core/Lock.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Friendica\Core;
-
 /**
  * @file src/Core/Lock.php
  * @brief Functions for preventing parallel execution of functions
  */
 
+namespace Friendica\Core;
+
 use Friendica\Core\Cache\CacheDriverFactory;
 use Friendica\Core\Cache\IMemoryCacheDriver;
 
@@ -47,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();
                }
        }
@@ -69,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());
                        }
                }
 
@@ -83,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());
                        }
                }
 
@@ -110,12 +110,13 @@ 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 acquire($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);
        }
 
        /**