aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-11-07 01:43:26 -0800
committerzotlabs <mike@macgirvin.com>2018-11-07 01:43:26 -0800
commit714831195319bcb5359511ce6cd9c5dccc6099dd (patch)
treeb32dc341c1ee307ea8ad655b3798ed945bbec310 /Zotlabs/Lib
parentf57fcefe6bc70ef06fcf61a204a15b142c030ac5 (diff)
parentfc1d8c0138f834ffa1c9044525c32757059c0f23 (diff)
downloadvolse-hubzilla-714831195319bcb5359511ce6cd9c5dccc6099dd.tar.gz
volse-hubzilla-714831195319bcb5359511ce6cd9c5dccc6099dd.tar.bz2
volse-hubzilla-714831195319bcb5359511ce6cd9c5dccc6099dd.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/PConfig.php107
1 files changed, 92 insertions, 15 deletions
diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php
index ec0792ce1..b9384cf6b 100644
--- a/Zotlabs/Lib/PConfig.php
+++ b/Zotlabs/Lib/PConfig.php
@@ -57,6 +57,7 @@ class PConfig {
\App::$config[$uid][$c]['config_loaded'] = true;
}
\App::$config[$uid][$c][$k] = $rr['v'];
+ \App::$config[$uid][$c]['pcfgud:'.$k] = $rr['updated'];
}
}
}
@@ -113,7 +114,7 @@ class PConfig {
* The value to store
* @return mixed Stored $value or false
*/
- static public function Set($uid, $family, $key, $value) {
+ static public function Set($uid, $family, $key, $value, $updated=NULL) {
// this catches subtle errors where this function has been called
// with local_channel() when not logged in (which returns false)
@@ -130,29 +131,74 @@ class PConfig {
$dbvalue = ((is_array($value)) ? serialize($value) : $value);
$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
+ if (! $updated) {
+ $updated = datetime_convert();
+ }
+
+ $hash = hash('sha256',$family.':'.$key);
+
+ if (self::Get($uid, 'hz_delpconfig', $hash) !== false) {
+ if (Get($uid, 'hz_delpconfig', $hash) > $updated) {
+ logger('Refusing to update pconfig with outdated info (Item deleted more recently).', LOGGER_NORMAL, LOG_ERR);
+ return self::Get($uid,$family,$key);
+ } else {
+ self::Delete($uid,'hz_delpconfig',$hash);
+ }
+ }
+
if(self::Get($uid, $family, $key) === false) {
if(! array_key_exists($uid, \App::$config))
\App::$config[$uid] = array();
if(! array_key_exists($family, \App::$config[$uid]))
\App::$config[$uid][$family] = array();
- $ret = q("INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ",
+
+ $ret = q("INSERT INTO pconfig ( uid, cat, k, v, updated ) VALUES ( %d, '%s', '%s', '%s', '%s' ) ",
intval($uid),
dbesc($family),
dbesc($key),
- dbesc($dbvalue)
+ dbesc($dbvalue),
+ dbesc($updated)
);
+
+ // There is a possible race condition if another process happens
+ // to insert something after this thread has Loaded and now. We should
+ // at least make a note of it if it happens.
+
+ if (!$ret) {
+ logger("Error: Insert to pconfig failed.",LOGGER_NORMAL, LOG_ERR);
+ }
+
+ \App::$config[$uid][$family]['pcfgud:'.$key] = $updated;
+
}
else {
+ $new = (\App::$config[$uid][$family]['pcfgud:'.$key] < $updated);
- $ret = q("UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s'",
- dbesc($dbvalue),
- intval($uid),
- dbesc($family),
- dbesc($key)
- );
+ if ($new) {
+
+ // @NOTE There is still a possible race condition under limited circumstances
+ // where a value will be updated by another thread with more current data than
+ // we have. At this point there is no easy way to test for it, so we update
+ // and hope for the best.
+
+ $ret = q("UPDATE pconfig SET v = '%s', updated = '%s' WHERE uid = %d and cat = '%s' AND k = '%s' ",
+ dbesc($dbvalue),
+ dbesc($updated),
+ intval($uid),
+ dbesc($family),
+ dbesc($key)
+ );
+
+ \App::$config[$uid][$family]['pcfgud:'.$key] = $updated;
+
+ } else {
+ logger('Refusing to update pconfig with outdated info.', LOGGER_NORMAL, LOG_ERR);
+ return self::Get($uid, $family, $key);
+ }
}
+
// keep a separate copy for all variables which were
// set in the life of this page. We need this to
// synchronise channel clones.
@@ -163,7 +209,11 @@ class PConfig {
\App::$config[$uid]['transient'][$family] = array();
\App::$config[$uid][$family][$key] = $value;
- \App::$config[$uid]['transient'][$family][$key] = $value;
+
+ if ($new) {
+ \App::$config[$uid]['transient'][$family][$key] = $value;
+ \App::$config[$uid]['transient'][$family]['pcfgud:'.$key] = $updated;
+ }
if($ret)
return $value;
@@ -186,18 +236,29 @@ class PConfig {
* The configuration key to delete
* @return mixed
*/
- static public function Delete($uid, $family, $key) {
+ static public function Delete($uid, $family, $key, $updated = NULL) {
if(is_null($uid) || $uid === false)
return false;
+ $updated = ($updated) ? $updated : datetime_convert();
+
+ $newer = (\App::$config[$uid][$family]['pcfgud:'.$key] < $updated);
+
+ if (! $newer) {
+ logger('Refusing to delete pconfig with outdated delete request.', LOGGER_NORMAL, LOG_ERR);
+ return false;
+ }
+
$ret = false;
- if(array_key_exists($uid,\App::$config)
- && is_array(\App::$config['uid'])
- && array_key_exists($family,\App::$config['uid'])
- && array_key_exists($key, \App::$config[$uid][$family]))
+ if (isset(\App::$config[$uid][$family][$key])) {
unset(\App::$config[$uid][$family][$key]);
+ }
+
+ if (isset(\App::$config[$uid][$family]['pcfgud:'.$key])) {
+ unset(\App::$config[$uid][$family]['pcfgud:'.$key]);
+ }
$ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'",
intval($uid),
@@ -205,6 +266,22 @@ class PConfig {
dbesc($key)
);
+ if ($family != 'hz_delpconfig') {
+ $hash = hash('sha256',$family.':'.$key);
+ set_pconfig($uid,'hz_delpconfig',$hash,$updated);
+ }
+
+ // Synchronize delete with clones.
+
+ if(! array_key_exists('transient', \App::$config[$uid]))
+ \App::$config[$uid]['transient'] = array();
+ if(! array_key_exists($family, \App::$config[$uid]['transient']))
+ \App::$config[$uid]['transient'][$family] = array();
+
+ if ($new) {
+ \App::$config[$uid]['transient'][$family]['pcfgdel:'.$key] = $updated;
+ }
+
return $ret;
}