X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Flock.php;h=a48b0ad342e1353b1b3b816e50bf0d5fc4c4cffb;hb=8398270ceee6afdb0ec46a28ddf04e2e337b707b;hp=707e33609e32456b64c7e295b8786b3f1e0964f3;hpb=234598280d96627861a1ff1dcfc8a4a59bd37054;p=friendica.git

diff --git a/include/lock.php b/include/lock.php
index 707e33609e..a48b0ad342 100644
--- a/include/lock.php
+++ b/include/lock.php
@@ -11,20 +11,23 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
 	$start = time();
 
 	do {
-		q("LOCK TABLE locks WRITE");
-		$r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
+		q("LOCK TABLE `locks` WRITE");
+		$r = q("SELECT `locked`, `created` FROM `locks` WHERE `name` = '%s' LIMIT 1",
 			dbesc($fn_name)
 		);
 
-		if((count($r)) && (! $r[0]['locked'])) {
-			q("UPDATE locks SET locked = 1 WHERE name = '%s' LIMIT 1",
+		if((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
+			q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'",
+				dbesc(datetime_convert()),
 				dbesc($fn_name)
 			);
 			$got_lock = true;
 		}
-		elseif(! $r) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r
-			q("INSERT INTO locks ( name, locked ) VALUES ( '%s', 1 )",
-				dbesc($fn_name)
+		elseif (! dbm::is_result($r)) {
+			/// @TODO the Boolean value for count($r) should be equivalent to the Boolean value of $r
+			q("INSERT INTO `locks` (`name`, `created`, `locked`) VALUES ('%s', '%s', 1)",
+				dbesc($fn_name),
+				dbesc(datetime_convert())
 			);
 			$got_lock = true;
 		}
@@ -37,7 +40,7 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
 	} while(($block) && (! $got_lock) && ((time() - $start) < $timeout));
 
 	logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock . ' time = ' . (time() - $start), LOGGER_DEBUG);
-	
+
 	return $got_lock;
 }}
 
@@ -54,10 +57,10 @@ function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
 				dbesc($fn_name)
 		     );
 
-		if(count($r) && $r[0]['locked'])
+		if (dbm::is_result($r) && $r[0]['locked'])
 			sleep($wait_sec);
 
-	} while(count($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
+	} while(dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
 
 	return;
 }}
@@ -65,7 +68,8 @@ function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
 
 if(! function_exists('unlock_function')) {
 function unlock_function($fn_name) {
-	$r = q("UPDATE locks SET locked = 0 WHERE name = '%s' LIMIT 1",
+	$r = q("UPDATE `locks` SET `locked` = 0, `created` = '%s' WHERE `name` = '%s'",
+			dbesc(NULL_DATE),
 			dbesc($fn_name)
 	     );