X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCore%2FConfig.php;h=755dc6ebbcf50bfcc82e9f31a7877ea5d89ea8e3;hb=cb3f09ae4f344ff83fca9dc435f3cbad1972737f;hp=0b889f8e50fb28e35765a6934329e2237a40606c;hpb=9e99066fd70a9dd9a291a523afba1a390f0e3a0b;p=friendica.git diff --git a/src/Core/Config.php b/src/Core/Config.php index 0b889f8e50..755dc6ebbc 100644 --- a/src/Core/Config.php +++ b/src/Core/Config.php @@ -1,30 +1,43 @@ getMode()->has(App\Mode::DBCONFIGAVAILABLE)) { + return; + } + + if (self::getApp()->getConfigValue('system', 'config_adapter') == 'preload') { + self::$adapter = new Config\PreloadConfigAdapter(); + } else { + self::$adapter = new Config\JITConfigAdapter(); + } + } /** * @brief Loads all configuration values of family into a cached storage. @@ -32,32 +45,23 @@ class Config { * All configuration values of the system are stored in global cache * which is available under the global variable $a->config * - * @param string $family - * The category of the configuration value + * @param string $family The category of the configuration value + * * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function load($family = "config") { - - // We don't preload "system" anymore. - // This reduces the number of database reads a lot. - if ($family === 'system') { + public static function load($family = "config") + { + // Database isn't ready or populated yet + if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) { return; } - $a = get_app(); - - $r = dba::select('config', array('v', 'k'), array('cat' => $family)); - while ($rr = dba::fetch($r)) { - $k = $rr['k']; - if ($family === 'config') { - $a->config[$k] = $rr['v']; - } else { - $a->config[$family][$k] = $rr['v']; - self::$cache[$family][$k] = $rr['v']; - self::$in_db[$family][$k] = true; - } + if (empty(self::$adapter)) { + self::init(); } - dba::close($r); + + self::$adapter->load($family); } /** @@ -72,54 +76,26 @@ class Config { * local config cache, pull it into the cache so we don't have * to hit the DB again for this item. * - * @param string $family - * The category of the configuration value - * @param string $key - * The configuration key to query - * @param mixed $default_value optional - * The value to return if key is not set (default: null) - * @param boolean $refresh optional - * If true the config is loaded from the db and not from the cache (default: false) + * @param string $family The category of the configuration value + * @param string $key The configuration key to query + * @param mixed $default_value optional, The value to return if key is not set (default: null) + * @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 + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function get($family, $key, $default_value = null, $refresh = false) { - - $a = get_app(); - - if (!$refresh) { - - // Do we have the cached value? Then return it - if (isset(self::$cache[$family][$key])) { - if (self::$cache[$family][$key] === '!!') { - return $default_value; - } else { - return self::$cache[$family][$key]; - } - } + public static function get($family, $key, $default_value = null, $refresh = false) + { + // Database isn't ready or populated yet, fallback to file config + if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) { + return self::getApp()->getConfigValue($family, $key, $default_value); } - $ret = dba::select('config', array('v'), array('cat' => $family, 'k' => $key), array('limit' => 1)); - if (DBM::is_result($ret)) { - // manage array value - $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret['v']) ? unserialize($ret['v']) : $ret['v']); - - // Assign the value from the database to the cache - self::$cache[$family][$key] = $val; - self::$in_db[$family][$key] = true; - return $val; - } elseif (isset($a->config[$family][$key])) { - - // Assign the value (mostly) from the .htconfig.php to the cache - self::$cache[$family][$key] = $a->config[$family][$key]; - self::$in_db[$family][$key] = false; - - return $a->config[$family][$key]; + if (empty(self::$adapter)) { + self::init(); } - self::$cache[$family][$key] = '!!'; - self::$in_db[$family][$key] = false; - - return $default_value; + return self::$adapter->get($family, $key, $default_value, $refresh); } /** @@ -130,47 +106,25 @@ class Config { * * Note: Please do not store booleans - convert to 0/1 integer values! * - * @param string $family - * The category of the configuration value - * @param string $key - * The configuration key to set - * @param string $value - * The value to store - * @return mixed Stored $value or false if the database update failed + * @param string $family The category of the configuration value + * @param string $key The configuration key to set + * @param mixed $value The value to store + * + * @return bool Operation success + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function set($family, $key, $value) { - $a = get_app(); - - // We store our setting values in a string variable. - // So we have to do the conversion here so that the compare below works. - // The exception are array values. - $dbvalue = (!is_array($value) ? (string)$value : $value); - - $stored = self::get($family, $key, null, true); - - if (($stored === $dbvalue) && self::$in_db[$family][$key]) { - return true; + public static function set($family, $key, $value) + { + // Database isn't ready or populated yet + if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) { + return false; } - if ($family === 'config') { - $a->config[$key] = $dbvalue; - } elseif ($family != 'system') { - $a->config[$family][$key] = $dbvalue; + if (empty(self::$adapter)) { + self::init(); } - // Assign the just added value to the cache - self::$cache[$family][$key] = $dbvalue; - - // manage array value - $dbvalue = (is_array($value) ? serialize($value) : $dbvalue); - - dba::update('config', array('v' => $dbvalue), array('cat' => $family, 'k' => $key), true); - - if ($ret) { - self::$in_db[$family][$key] = true; - return $value; - } - return $ret; + return self::$adapter->set($family, $key, $value); } /** @@ -179,21 +133,23 @@ class Config { * Removes the configured value from the stored cache in $a->config * and removes it from the database. * - * @param string $family - * The category of the configuration value - * @param string $key - * The configuration key to delete + * @param string $family The category of the configuration value + * @param string $key The configuration key to delete + * * @return mixed + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function delete($family, $key) { - - if (isset(self::$cache[$family][$key])) { - unset(self::$cache[$family][$key]); - unset(self::$in_db[$family][$key]); + public static function delete($family, $key) + { + // Database isn't ready or populated yet + if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) { + return false; } - $ret = dba::delete('config', array('cat' => $family, 'k' => $key)); + if (empty(self::$adapter)) { + self::init(); + } - return $ret; + return self::$adapter->delete($family, $key); } }