Merge pull request #5294 from annando/use-gravity

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

diff --git a/src/Util/Lock.php b/src/Util/Lock.php
index 9c449844597c56620bb90106ce67bd19fe4772c8..eba264ad932d6ba6357c5fd566cafbc8c7ff8a30 100644 (file)
--- a/src/Util/Lock.php
+++ b/src/Util/Lock.php
@@ -14,12 +14,14 @@ use Friendica\Database\DBM;
 use Memcache;
 use dba;
 
+require_once 'include/dba.php';
+
 /**
  * @brief This class contain Functions for preventing parallel execution of functions
  */
 class Lock
 {
-       private static $semaphore = array();
+       private static $semaphore = [];
 
        /**
         * @brief Check for memcache and open a connection if configured
@@ -62,7 +64,7 @@ class Lock
                $file = $temp.'/'.$fn_name.'.sem';
 
                if (!file_exists($file)) {
-                       file_put_contents($file, $function);
+                       file_put_contents($file, $fn_name);
                }
 
                return ftok($file, 'f');
@@ -124,7 +126,7 @@ class Lock
 
                do {
                        dba::lock('locks');
-                       $lock = dba::select('locks', array('locked', 'pid'), array('name' => $fn_name), array('limit' => 1));
+                       $lock = dba::selectFirst('locks', ['locked', 'pid'], ['name' => $fn_name]);
 
                        if (DBM::is_result($lock)) {
                                if ($lock['locked']) {
@@ -138,11 +140,11 @@ class Lock
                                        }
                                }
                                if (!$lock['locked']) {
-                                       dba::update('locks', array('locked' => true, 'pid' => getmypid()), array('name' => $fn_name));
+                                       dba::update('locks', ['locked' => true, 'pid' => getmypid()], ['name' => $fn_name]);
                                        $got_lock = true;
                                }
                        } elseif (!DBM::is_result($lock)) {
-                               dba::insert('locks', array('name' => $fn_name, 'locked' => true, 'pid' => getmypid()));
+                               dba::insert('locks', ['name' => $fn_name, 'locked' => true, 'pid' => getmypid()]);
                                $got_lock = true;
                        }
 
@@ -187,7 +189,7 @@ class Lock
                        return;
                }
 
-               dba::update('locks', array('locked' => false, 'pid' => 0), array('name' => $fn_name, 'pid' => getmypid()));
+               dba::update('locks', ['locked' => false, 'pid' => 0], ['name' => $fn_name, 'pid' => getmypid()]);
                return;
        }
 
@@ -203,7 +205,7 @@ class Lock
                        return;
                }
 
-               dba::update('locks', array('locked' => false, 'pid' => 0), array('pid' => getmypid()));
+               dba::update('locks', ['locked' => false, 'pid' => 0], ['pid' => getmypid()]);
                return;
        }
 }