Avoid memory issue in exception

[friendica.git] / src / Core / Config.php

diff --git a/src/Core/Config.php b/src/Core/Config.php
index 0db8f0b882bb318801bed7f9d20cc346d9156902..559ee83ece57e08b8bfedb53d94510b082606459 100644 (file)
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -8,6 +8,10 @@
  */
 namespace Friendica\Core;
 
+use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Config\IConfigAdapter;
+use Friendica\Core\Config\IConfigCache;
+
 /**
  * @brief Arbitrary system configuration storage
  *
@@ -18,23 +22,23 @@ namespace Friendica\Core;
 class Config
 {
        /**
-        * @var Config\IConfigAdapter
+        * @var Config\IConfigAdapter|null
         */
        private static $adapter;
 
        /**
         * @var Config\IConfigCache
         */
-       private static $config;
+       private static $cache;
 
        /**
         * Initialize the config with only the cache
         *
-        * @param Config\IConfigCache $config  The configuration cache
+        * @param Config\IConfigCache $cache  The configuration cache
         */
-       public static function init($config)
+       public static function init(Config\IConfigCache $cache)
        {
-               self::$config  = $config;
+               self::$cache  = $cache;
        }
 
        /**
@@ -42,7 +46,7 @@ class Config
         *
         * @param Config\IConfigAdapter $adapter
         */
-       public static function setAdapter($adapter)
+       public static function setAdapter(Config\IConfigAdapter $adapter)
        {
                self::$adapter = $adapter;
        }
@@ -50,8 +54,7 @@ class Config
        /**
         * @brief Loads all configuration values of family into a cached storage.
         *
-        * All configuration values of the system are stored in global cache
-        * which is available under the global variable self::$config
+        * All configuration values of the system are stored in the cache ( @see IConfigCache )
         *
         * @param string $family The category of the configuration value
         *
@@ -59,7 +62,7 @@ class Config
         */
        public static function load($family = "config")
        {
-               if (!isset(self::$adapter)) {
+               if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
                        return;
                }
 
@@ -71,12 +74,8 @@ class Config
         * ($family) and a key.
         *
         * Get a particular config value from the given category ($family)
-        * and the $key from a cached storage in static::config[$uid].
-        * $instore is only used by the set_config function
-        * to determine if the key already exists in the DB
-        * If a key is found in the DB but doesn't exist in
-        * local config cache, pull it into the cache so we don't have
-        * to hit the DB again for this item.
+        * and the $key from a cached storage either from the self::$adapter
+        * (@see IConfigAdapter ) or from the static::$cache (@see IConfigCache ).
         *
         * @param string  $family        The category of the configuration value
         * @param string  $key           The configuration key to query
@@ -87,8 +86,8 @@ class Config
         */
        public static function get($family, $key, $default_value = null, $refresh = false)
        {
-               if (!isset(self::$adapter)) {
-                       return self::$config->get($family, $key, $default_value);
+               if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
+                       return self::$cache->get($family, $key, $default_value);
                }
 
                return self::$adapter->get($family, $key, $default_value, $refresh);
@@ -98,7 +97,6 @@ class Config
         * @brief Sets a configuration value for system config
         *
         * Stores a config value ($value) in the category ($family) under the key ($key)
-        * for the user_id $uid.
         *
         * Note: Please do not store booleans - convert to 0/1 integer values!
         *
@@ -110,9 +108,8 @@ class Config
         */
        public static function set($family, $key, $value)
        {
-               if (!isset(self::$adapter)) {
-                       self::$config->set($family, $key, $value);
-                       return true;
+               if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
+                       return self::$cache->set($family, $key, $value);
                }
 
                return self::$adapter->set($family, $key, $value);
@@ -121,8 +118,8 @@ class Config
        /**
         * @brief Deletes the given key from the system configuration.
         *
-        * Removes the configured value from the stored cache in Config::$config
-        * and removes it from the database.
+        * Removes the configured value from the stored cache in self::$config
+        * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter ).
         *
         * @param string $family The category of the configuration value
         * @param string $key    The configuration key to delete
@@ -131,8 +128,8 @@ class Config
         */
        public static function delete($family, $key)
        {
-               if (!isset(self::$adapter)) {
-                       self::$config->delete($family, $key);
+               if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
+                       self::$cache->delete($family, $key);
                }
 
                return self::$adapter->delete($family, $key);