tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Fixing value check for configuration

Browse source
This commit is contained in:
Philipp Holzer 2019-02-18 11:27:51 +01:00
parent 86aaa6565e
commit f536107911
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
6 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Core/Config/Adapter/JITConfigAdapter.php
View file

@ -1,7 +1,6 @@
<?php <?php
namespace Friendica\Core\Config\Adapter; namespace Friendica\Core\Config\Adapter;
use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Database\DBA;
/** /**
@ -58,22 +57,14 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
// manage array value // manage array value
$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']); $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
if ($key === 'last_worker_execution') {
Logger::alert('catchmeifyou', ['store' => $value, 'in_db' => $this->in_db[$cat][$key]]);
}
if (isset($value) && $value !== '') { if (isset($value) && $value !== '') {
$this->in_db[$cat][$key] = true; $this->in_db[$cat][$key] = true;
return $value; return $value;
} else {
$this->in_db[$cat][$key] = false;
return '!<unset>!';
} }
} else {
$this->in_db[$cat][$key] = false;
return '!<unset>!';
} }
$this->in_db[$cat][$key] = false;
return '!<unset>!';
} }
/** /**
@ -99,10 +90,6 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
$this->in_db[$cat][$key] = false; $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]) { if (($stored === $dbvalue) && $this->in_db[$cat][$key]) {
return true; return true;
} }

13
src/Core/Config/Adapter/JITPConfigAdapter.php
View file

@ -57,13 +57,14 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
// manage array value // manage array value
$value = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']); $value = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
$this->in_db[$uid][$cat][$key] = true; if (isset($value) && $value !== '') {
return $value; $this->in_db[$uid][$cat][$key] = true;
} else { return $value;
}
$this->in_db[$uid][$cat][$key] = false;
return '!<unset>!';
} }
$this->in_db[$uid][$cat][$key] = false;
return '!<unset>!';
} }
/** /**

9
src/Core/Config/Adapter/PreloadConfigAdapter.php
View file

@ -55,11 +55,12 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
// manage array value // manage array value
$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']); $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
return $value; if (isset($value) && $value !== '') {
} else { return $value;
}
return '!<unset>!';
} }
return '!<unset>!';
} }
/** /**

7
src/Core/Config/Adapter/PreloadPConfigAdapter.php
View file

@ -71,10 +71,11 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
// manage array value // manage array value
$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']); $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
return $value; if (isset($value) && $value !== '') {
} else { return $value;
return '!<unset>!'; }
} }
return '!<unset>!';
} }
/** /**

6
src/Core/Config/Configuration.php
View file

@ -2,8 +2,6 @@
namespace Friendica\Core\Config; namespace Friendica\Core\Config;
use Friendica\Core\Logger;
/** /**
* This class is responsible for all system-wide configuration values in Friendica * This class is responsible for all system-wide configuration values in Friendica
* There are two types of storage * There are two types of storage
@ -116,10 +114,6 @@ class Configuration
*/ */
public function set($cat, $key, $value) public function set($cat, $key, $value)
{ {
if ($key === 'last_worker_execution') {
Logger::alert('catchmeifyou', ['value' => $value]);
}
// set the cache first // set the cache first
$cached = $this->configCache->set($cat, $key, $value); $cached = $this->configCache->set($cat, $key, $value);

2
src/Core/Worker.php
View file

@ -277,8 +277,6 @@ class Worker
$age = (time() - self::$last_update) / 60; $age = (time() - self::$last_update) / 60;
self::$last_update = time(); self::$last_update = time();
Logger::alert('last_update', ['age' => $age, 'last_update' => self::$last_update]);
if ($age > 1) { if ($age > 1) {
$stamp = (float)microtime(true); $stamp = (float)microtime(true);
DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]); DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);