From a3d6062476dde7fecfb559bb366a3f22cb6ead57 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Mon, 18 Feb 2019 08:51:38 +0100
Subject: [PATCH] check if value is set get basepath with config instead cache

---
 src/App.php                                  |  2 +-
 src/Core/Config/Adapter/JITConfigAdapter.php | 18 ++++++++++++++++--
 src/Core/Config/Configuration.php            |  6 ++++++
 src/Core/Worker.php                          |  2 ++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/App.php b/src/App.php
index f41d486b5..f48abcf9c 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 95211777f..0c94f8127 100644
--- a/src/Core/Config/Adapter/JITConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITConfigAdapter.php
@@ -1,6 +1,7 @@
 <?php
 namespace Friendica\Core\Config\Adapter;
 
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 
 /**
@@ -57,8 +58,17 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
 			// manage array value
 			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
 
-			$this->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 '!<unset>!';
+			}
 		} 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 2ac0da0ad..48220c2de 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 dff60e9fa..c5d60f14d 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]);