diff --git a/src/App.php b/src/App.php index f41d486b5c..f48abcf9cb 100644 --- a/src/App.php +++ b/src/App.php @@ -219,7 +219,7 @@ class App $this->logger = $logger; $this->config = $config; $this->profiler = $profiler; - $this->basePath = $this->config->getCache()->get('system', 'basepath'); + $this->basePath = $this->config->get('system', 'basepath'); if (!Core\System::isDirectoryUsable($this->basePath, false)) { throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.'); diff --git a/src/Core/Config/Adapter/JITConfigAdapter.php b/src/Core/Config/Adapter/JITConfigAdapter.php index 95211777f3..0c94f81274 100644 --- a/src/Core/Config/Adapter/JITConfigAdapter.php +++ b/src/Core/Config/Adapter/JITConfigAdapter.php @@ -1,6 +1,7 @@ in_db[$cat][$key] = true; - return $value; + if ($key === 'last_worker_execution') { + Logger::alert('catchmeifyou', ['store' => $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; @@ -89,6 +99,10 @@ 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/Configuration.php b/src/Core/Config/Configuration.php index 2ac0da0ad1..48220c2de5 100644 --- a/src/Core/Config/Configuration.php +++ b/src/Core/Config/Configuration.php @@ -2,6 +2,8 @@ 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 @@ -114,6 +116,10 @@ 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 dff60e9fa5..c5d60f14da 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -277,6 +277,8 @@ 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]);