Refactor IManageConfigValues interface

This commit is contained in:
Philipp 2022-12-28 02:07:38 +01:00
parent 326566638f
commit 1e574d5383
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
13 changed files with 46 additions and 49 deletions

View file

@ -71,7 +71,7 @@ if (DI::mode()->isInstall()) {
DI::mode()->setExecutor(Mode::DAEMON); DI::mode()->setExecutor(Mode::DAEMON);
DI::config()->load(); DI::config()->reload();
if (empty(DI::config()->get('system', 'pidfile'))) { if (empty(DI::config()->get('system', 'pidfile'))) {
die(<<<TXT die(<<<TXT

View file

@ -296,8 +296,7 @@ class App
*/ */
public function getBasePath(): string public function getBasePath(): string
{ {
// Don't use the basepath of the config table for basepath (it should always be the config-file one) return $this->config->get('system', 'basepath');
return $this->config->getCache()->get('system', 'basepath');
} }
/** /**

View file

@ -157,7 +157,7 @@ HELP;
if (count($this->args) == 1) { if (count($this->args) == 1) {
$cat = $this->getArgument(0); $cat = $this->getArgument(0);
$this->config->load($cat); $this->config->reload();
$configCache = $this->config->getCache(); $configCache = $this->config->getCache();
if ($configCache->get($cat) !== null) { if ($configCache->get($cat) !== null) {
@ -178,7 +178,7 @@ HELP;
} }
if (count($this->args) == 0) { if (count($this->args) == 0) {
$this->config->load(); $this->config->reload();
if ($this->config->get('system', 'config_adapter') == 'jit' && $this->appMode->has(App\Mode::DBCONFIGAVAILABLE)) { if ($this->config->get('system', 'config_adapter') == 'jit' && $this->appMode->has(App\Mode::DBCONFIGAVAILABLE)) {
$this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only'); $this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');

View file

@ -30,36 +30,32 @@ use Friendica\Core\Config\ValueObject\Cache;
interface IManageConfigValues interface IManageConfigValues
{ {
/** /**
* Loads all configuration values of family into a cached storage. * Reloads all configuration values (from filesystem and environment variables)
* *
* All configuration values of the system are stored in the cache. * All configuration values of the system are stored in the cache.
* *
* @param string $cat The category of the configuration value
*
* @return void * @return void
* *
* @throws ConfigPersistenceException In case the persistence layer throws errors * @throws ConfigPersistenceException In case the persistence layer throws errors
*/ */
public function load(string $cat = 'config'); public function reload();
/** /**
* Get a particular user's config variable given the category name * Get a particular user's config variable given the category name
* ($cat) and a $key. * ($cat) and a $key.
* *
* Get a particular config value from the given category ($cat) * Get a particular config value from the given category ($cat)
* and the $key from a cached storage either from the database or from the cache.
* *
* @param string $cat The category of the configuration value * @param string $cat The category of the configuration value
* @param string $key The configuration key to query * @param string $key The configuration key to query
* @param mixed $default_value Deprecated, use `Config->get($cat, $key, null, $refresh) ?? $default_value` instead * @param mixed $default_value Deprecated, use `Config->get($cat, $key, null, $refresh) ?? $default_value` instead
* @param boolean $refresh optional, If true the config is loaded from the db and not from the cache (default: false)
* *
* @return mixed Stored value or null if it does not exist * @return mixed Stored value or null if it does not exist
* *
* @throws ConfigPersistenceException In case the persistence layer throws errors * @throws ConfigPersistenceException In case the persistence layer throws errors
* *
*/ */
public function get(string $cat, string $key, $default_value = null, bool $refresh = false); public function get(string $cat, string $key, $default_value = null);
/** /**
* Sets a configuration value for system config * Sets a configuration value for system config
@ -81,6 +77,8 @@ interface IManageConfigValues
/** /**
* Save back the overridden values of the config cache * Save back the overridden values of the config cache
*
* @throws ConfigPersistenceException In case the persistence layer throws errors
*/ */
public function save(); public function save();

View file

@ -81,21 +81,4 @@ class Config
return $configCache; return $configCache;
} }
/**
* @param Cache $configCache The config cache of this adapter
* @param Repository\Config $configRepo The configuration repository
*
* @return Capability\IManageConfigValues
*/
public function create(Util\ConfigFileManager $loader, Cache $configCache, Repository\Config $configRepo)
{
if ($configCache->get('system', 'config_adapter') === 'preload') {
$configuration = new Type\PreloadConfig($loader, $configCache, $configRepo);
} else {
$configuration = new Type\JitConfig($loader, $configCache, $configRepo);
}
return $configuration;
}
} }

View file

@ -22,6 +22,8 @@
namespace Friendica\Core\Config\Model; namespace Friendica\Core\Config\Model;
use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\Config\Exception\ConfigFileException;
use Friendica\Core\Config\Exception\ConfigPersistenceException;
use Friendica\Core\Config\Util\ConfigFileManager; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Core\Config\ValueObject\Cache; use Friendica\Core\Config\ValueObject\Cache;
@ -38,14 +40,19 @@ class Config implements IManageConfigValues
/** @var ConfigFileManager */ /** @var ConfigFileManager */
protected $configFileManager; protected $configFileManager;
/** @var array */
protected $server;
/** /**
* @param ConfigFileManager $configFileManager The configuration file manager to save back configs * @param ConfigFileManager $configFileManager The configuration file manager to save back configs
* @param Cache $configCache The configuration cache (based on the config-files) * @param Cache $configCache The configuration cache (based on the config-files)
* @param array $server The $_SERVER variable
*/ */
public function __construct(ConfigFileManager $configFileManager, Cache $configCache) public function __construct(ConfigFileManager $configFileManager, Cache $configCache, array $server = [])
{ {
$this->configFileManager = $configFileManager; $this->configFileManager = $configFileManager;
$this->configCache = $configCache; $this->configCache = $configCache;
$this->server = $server;
} }
/** /**
@ -56,24 +63,36 @@ class Config implements IManageConfigValues
return $this->configCache; return $this->configCache;
} }
/** {@inheritDoc} */
public function save() public function save()
{ {
$this->configFileManager->saveData($this->configCache); try {
$this->configFileManager->saveData($this->configCache);
} catch (ConfigFileException $e) {
throw new ConfigPersistenceException('Cannot save config', $e);
}
} }
public function load(string $cat = 'config') /** {@inheritDoc} */
public function reload()
{ {
$configCache = new Cache(); $configCache = new Cache();
$this->configFileManager->setupCache($configCache, $_SERVER); try {
$this->configFileManager->setupCache($configCache, $this->server);
} catch (ConfigFileException $e) {
throw new ConfigPersistenceException('Cannot reload config', $e);
}
$this->configCache = $configCache; $this->configCache = $configCache;
} }
public function get(string $cat, string $key, $default_value = null, bool $refresh = false) /** {@inheritDoc} */
public function get(string $cat, string $key, $default_value = null)
{ {
return $this->configCache->get($cat, $key) ?? $default_value; return $this->configCache->get($cat, $key) ?? $default_value;
} }
/** {@inheritDoc} */
public function set(string $cat, string $key, $value, bool $autosave = true): bool public function set(string $cat, string $key, $value, bool $autosave = true): bool
{ {
$stored = $this->configCache->set($cat, $key, $value, Cache::SOURCE_DATA); $stored = $this->configCache->set($cat, $key, $value, Cache::SOURCE_DATA);
@ -85,6 +104,7 @@ class Config implements IManageConfigValues
return $stored; return $stored;
} }
/** {@inheritDoc} */
public function delete(string $cat, string $key, bool $autosave = true): bool public function delete(string $cat, string $key, bool $autosave = true): bool
{ {
$removed = $this->configCache->delete($cat, $key); $removed = $this->configCache->delete($cat, $key);

View file

@ -54,7 +54,7 @@ class Update
} }
// Don't check the status if the last update was failed // Don't check the status if the last update was failed
if (DI::config()->get('system', 'update', Update::SUCCESS, true) == Update::FAILED) { if (DI::config()->get('system', 'update', Update::SUCCESS) == Update::FAILED) {
return; return;
} }
@ -119,7 +119,7 @@ class Update
DI::lock()->release('dbupdate', true); DI::lock()->release('dbupdate', true);
} }
$build = DI::config()->get('system', 'build', null, true); $build = DI::config()->get('system', 'build', null);
if (empty($build) || ($build > DB_UPDATE_VERSION)) { if (empty($build) || ($build > DB_UPDATE_VERSION)) {
$build = DB_UPDATE_VERSION - 1; $build = DB_UPDATE_VERSION - 1;
@ -132,7 +132,7 @@ class Update
$stored = intval($build); $stored = intval($build);
$current = intval(DB_UPDATE_VERSION); $current = intval(DB_UPDATE_VERSION);
if ($stored < $current || $force) { if ($stored < $current || $force) {
DI::config()->load('database'); DI::config()->reload();
// Compare the current structure with the defined structure // Compare the current structure with the defined structure
// If the Lock is acquired, never release it automatically to avoid double updates // If the Lock is acquired, never release it automatically to avoid double updates
@ -141,7 +141,7 @@ class Update
Logger::notice('Update starting.', ['from' => $stored, 'to' => $current]); Logger::notice('Update starting.', ['from' => $stored, 'to' => $current]);
// Checks if the build changed during Lock acquiring (so no double update occurs) // Checks if the build changed during Lock acquiring (so no double update occurs)
$retryBuild = DI::config()->get('system', 'build', null, true); $retryBuild = DI::config()->get('system', 'build', null);
if ($retryBuild !== $build) { if ($retryBuild !== $build) {
Logger::notice('Update already done.', ['from' => $stored, 'to' => $current]); Logger::notice('Update already done.', ['from' => $stored, 'to' => $current]);
DI::lock()->release('dbupdate'); DI::lock()->release('dbupdate');

View file

@ -331,7 +331,7 @@ class Worker
$mypid = getmypid(); $mypid = getmypid();
// Quit when in maintenance // Quit when in maintenance
if (DI::config()->get('system', 'maintenance', false, true)) { if (DI::config()->get('system', 'maintenance', false)) {
Logger::notice('Maintenance mode - quit process', ['pid' => $mypid]); Logger::notice('Maintenance mode - quit process', ['pid' => $mypid]);
return false; return false;
} }

View file

@ -157,7 +157,7 @@ class Friendica extends BaseModule
$visible_addons = Addon::getVisibleList(); $visible_addons = Addon::getVisibleList();
$config->load('feature_lock'); $config->reload();
$locked_features = []; $locked_features = [];
$featureLocks = $config->get('config', 'feature_lock'); $featureLocks = $config->get('config', 'feature_lock');
if (isset($featureLocks)) { if (isset($featureLocks)) {

View file

@ -32,7 +32,7 @@ class DBUpdate
public static function execute() public static function execute()
{ {
// Just in case the last update wasn't failed // Just in case the last update wasn't failed
if (DI::config()->get('system', 'update', Update::SUCCESS, true) != Update::FAILED) { if (DI::config()->get('system', 'update', Update::SUCCESS) != Update::FAILED) {
Update::run(DI::app()->getBasePath()); Update::run(DI::app()->getBasePath());
} }
} }

View file

@ -99,6 +99,9 @@ return [
], ],
Config\Capability\IManageConfigValues::class => [ Config\Capability\IManageConfigValues::class => [
'instanceOf' => Config\Model\Config::class, 'instanceOf' => Config\Model\Config::class,
'constructParams' => [
$_SERVER,
],
], ],
PConfig\Capability\IManagePersonalConfigValues::class => [ PConfig\Capability\IManagePersonalConfigValues::class => [
'instanceOf' => PConfig\Factory\PConfig::class, 'instanceOf' => PConfig\Factory\PConfig::class,

View file

@ -1178,12 +1178,6 @@ function update_1505()
function update_1508() function update_1508()
{ {
$categories = DBA::toArray(DBA::p("SELECT DISTINCT `cat` AS 'cat' FROM `config`"));
foreach ($categories as $category) {
DI::config()->load($category['cat']);
}
$config = DBA::selectToArray('config'); $config = DBA::selectToArray('config');
foreach ($config as $entry) { foreach ($config as $entry) {

View file

@ -49,7 +49,7 @@ $login_bg_color = '';
$modified = time(); $modified = time();
if (DI::mode()->has(\Friendica\App\Mode::MAINTENANCEDISABLED)) { if (DI::mode()->has(\Friendica\App\Mode::MAINTENANCEDISABLED)) {
DI::config()->load('frio'); DI::config()->reload('frio');
// Default to hard-coded values for empty settings // Default to hard-coded values for empty settings
$scheme = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema')); $scheme = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema'));