harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-20190107a' into 'dev'

Browse Source 
Tweak to deal with changes that may happen within the same second.

See merge request hubzilla/core!1462
This commit is contained in:
Mario 2019-01-09 10:16:05 +01:00
commit 24354b9dcc
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Zotlabs/Lib/PConfig.php
View File

@ -131,14 +131,19 @@ class PConfig {
$dbvalue = ((is_array($value)) ? serialize($value) : $value); $dbvalue = ((is_array($value)) ? serialize($value) : $value);
$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
$now = datetime_convert();
if (! $updated) { if (! $updated) {
$updated = datetime_convert(); //Sometimes things happen fast... very fast.
//To make sure legitimate updates aren't rejected
//because not enough time has passed. We say our updates
//happened just a short time in the past rather than right now.
$updated = datetime_convert('UTC','UTC','-2 seconds');
} }
$hash = hash('sha256',$family.':'.$key); $hash = hash('sha256',$family.':'.$key);
if (self::Get($uid, 'hz_delpconfig', $hash) !== false) { if (self::Get($uid, 'hz_delpconfig', $hash) !== false) {
if (self::Get($uid, 'hz_delpconfig', $hash) > $updated) { if (self::Get($uid, 'hz_delpconfig', $hash) > $now) {
logger('Refusing to update pconfig with outdated info (Item deleted more recently).', LOGGER_NORMAL, LOG_ERR); logger('Refusing to update pconfig with outdated info (Item deleted more recently).', LOGGER_NORMAL, LOG_ERR);
return self::Get($uid,$family,$key); return self::Get($uid,$family,$key);
} else { } else {
@ -173,7 +178,7 @@ class PConfig {
} }
else { else {
$new = (\App::$config[$uid][$family]['pcfgud:'.$key] < $updated); $new = (\App::$config[$uid][$family]['pcfgud:'.$key] < $now);
if ($new) { if ($new) {
@ -241,9 +246,9 @@ class PConfig {
if(is_null($uid) || $uid === false) if(is_null($uid) || $uid === false)
return false; return false;
$updated = ($updated) ? $updated : datetime_convert(); $updated = ($updated) ? $updated : datetime_convert('UTC','UTC','-2 seconds');
$now = datetime_convert();
$newer = (\App::$config[$uid][$family]['pcfgud:'.$key] < $updated); $newer = (\App::$config[$uid][$family]['pcfgud:'.$key] < $now);
if (! $newer) { if (! $newer) {
logger('Refusing to delete pconfig with outdated delete request.', LOGGER_NORMAL, LOG_ERR); logger('Refusing to delete pconfig with outdated delete request.', LOGGER_NORMAL, LOG_ERR);