From: Philipp Holzer Date: Mon, 18 Feb 2019 10:27:51 +0000 (+0100) Subject: Fixing value check for configuration X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f53610791184ad8a567fb6a61cb3ad437519c2a4;p=friendica.git Fixing value check for configuration --- diff --git a/src/Core/Config/Adapter/JITConfigAdapter.php b/src/Core/Config/Adapter/JITConfigAdapter.php index 0c94f81274..5d06dc2b3e 100644 --- a/src/Core/Config/Adapter/JITConfigAdapter.php +++ b/src/Core/Config/Adapter/JITConfigAdapter.php @@ -1,7 +1,6 @@ $value, 'in_db' => $this->in_db[$cat][$key]]); - } - if (isset($value) && $value !== '') { $this->in_db[$cat][$key] = true; return $value; - } else { - $this->in_db[$cat][$key] = false; - return '!!'; } - } else { - - $this->in_db[$cat][$key] = false; - return '!!'; } + + $this->in_db[$cat][$key] = false; + return '!!'; } /** @@ -99,10 +90,6 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte $this->in_db[$cat][$key] = false; } - if ($key === 'last_worker_execution') { - Logger::alert('catchmeifyou', ['db' => $dbvalue, 'store' => $stored, 'in_db' => $this->in_db[$cat][$key]]); - } - if (($stored === $dbvalue) && $this->in_db[$cat][$key]) { return true; } diff --git a/src/Core/Config/Adapter/JITPConfigAdapter.php b/src/Core/Config/Adapter/JITPConfigAdapter.php index c5f3a381ed..d3c38623b4 100644 --- a/src/Core/Config/Adapter/JITPConfigAdapter.php +++ b/src/Core/Config/Adapter/JITPConfigAdapter.php @@ -57,13 +57,14 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap // manage array value $value = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']); - $this->in_db[$uid][$cat][$key] = true; - return $value; - } else { - - $this->in_db[$uid][$cat][$key] = false; - return '!!'; + if (isset($value) && $value !== '') { + $this->in_db[$uid][$cat][$key] = true; + return $value; + } } + + $this->in_db[$uid][$cat][$key] = false; + return '!!'; } /** diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php index fa691a16d3..b1866a259d 100644 --- a/src/Core/Config/Adapter/PreloadConfigAdapter.php +++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php @@ -55,11 +55,12 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd // manage array value $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']); - return $value; - } else { - - return '!!'; + if (isset($value) && $value !== '') { + return $value; + } } + + return '!!'; } /** diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php index e79a4a1e3c..857f2b1766 100644 --- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php +++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php @@ -71,10 +71,11 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig // manage array value $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']); - return $value; - } else { - return '!!'; + if (isset($value) && $value !== '') { + return $value; + } } + return '!!'; } /** diff --git a/src/Core/Config/Configuration.php b/src/Core/Config/Configuration.php index 48220c2de5..2ac0da0ad1 100644 --- a/src/Core/Config/Configuration.php +++ b/src/Core/Config/Configuration.php @@ -2,8 +2,6 @@ namespace Friendica\Core\Config; -use Friendica\Core\Logger; - /** * This class is responsible for all system-wide configuration values in Friendica * There are two types of storage @@ -116,10 +114,6 @@ class Configuration */ public function set($cat, $key, $value) { - if ($key === 'last_worker_execution') { - Logger::alert('catchmeifyou', ['value' => $value]); - } - // set the cache first $cached = $this->configCache->set($cat, $key, $value); diff --git a/src/Core/Worker.php b/src/Core/Worker.php index 13db8d97e8..4007a7923c 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -277,8 +277,6 @@ class Worker $age = (time() - self::$last_update) / 60; self::$last_update = time(); - Logger::alert('last_update', ['age' => $age, 'last_update' => self::$last_update]); - if ($age > 1) { $stamp = (float)microtime(true); DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);