Avoid memory issue in exception

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

diff --git a/src/Core/Config.php b/src/Core/Config.php
index bff5d81ff07641bac22a6fa1f8238e73f5d3a989..559ee83ece57e08b8bfedb53d94510b082606459 100644 (file)
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -8,10 +8,9 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
-use Friendica\Core\Config;
-
-require_once 'include/dba.php';
+use Friendica\Core\Config\ConfigCache;
+use Friendica\Core\Config\IConfigAdapter;
+use Friendica\Core\Config\IConfigCache;
 
 /**
  * @brief Arbitrary system configuration storage
@@ -20,29 +19,42 @@ require_once 'include/dba.php';
  * If we ever would decide to return exactly the variable type as entered,
  * we will have fun with the additional features. :-)
  */
-class Config extends BaseObject
+class Config
 {
        /**
-        * @var Friendica\Core\Config\IConfigAdapter
+        * @var Config\IConfigAdapter|null
+        */
+       private static $adapter;
+
+       /**
+        * @var Config\IConfigCache
         */
-       private static $adapter = null;
+       private static $cache;
 
-       public static function init()
+       /**
+        * Initialize the config with only the cache
+        *
+        * @param Config\IConfigCache $cache  The configuration cache
+        */
+       public static function init(Config\IConfigCache $cache)
        {
-               $a = self::getApp();
+               self::$cache  = $cache;
+       }
 
-               if (isset($a->config['system']['config_adapter']) && $a->config['system']['config_adapter'] == 'preload') {
-                       self::$adapter = new Config\PreloadConfigAdapter();
-               } else {
-                       self::$adapter = new Config\JITConfigAdapter();
-               }
+       /**
+        * Add the adapter for DB-backend
+        *
+        * @param Config\IConfigAdapter $adapter
+        */
+       public static function setAdapter(Config\IConfigAdapter $adapter)
+       {
+               self::$adapter = $adapter;
        }
 
        /**
         * @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 $a->config
+        * All configuration values of the system are stored in the cache ( @see IConfigCache )
         *
         * @param string $family The category of the configuration value
         *
@@ -50,8 +62,8 @@ class Config extends BaseObject
         */
        public static function load($family = "config")
        {
-               if (empty(self::$adapter)) {
-                       self::init();
+               if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
+                       return;
                }
 
                self::$adapter->load($family);
@@ -62,12 +74,8 @@ class Config extends BaseObject
         * ($family) and a key.
         *
         * Get a particular config value from the given category ($family)
-        * and the $key from a cached storage in $a->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
@@ -78,8 +86,8 @@ class Config extends BaseObject
         */
        public static function get($family, $key, $default_value = null, $refresh = false)
        {
-               if (empty(self::$adapter)) {
-                       self::init();
+               if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
+                       return self::$cache->get($family, $key, $default_value);
                }
 
                return self::$adapter->get($family, $key, $default_value, $refresh);
@@ -89,7 +97,6 @@ class Config extends BaseObject
         * @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!
         *
@@ -97,12 +104,12 @@ class Config extends BaseObject
         * @param string $key    The configuration key to set
         * @param mixed  $value  The value to store
         *
-        * @return mixed Stored $value or false if the database update failed
+        * @return bool Operation success
         */
        public static function set($family, $key, $value)
        {
-               if (empty(self::$adapter)) {
-                       self::init();
+               if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
+                       return self::$cache->set($family, $key, $value);
                }
 
                return self::$adapter->set($family, $key, $value);
@@ -111,8 +118,8 @@ class Config extends BaseObject
        /**
         * @brief Deletes the given key from the system configuration.
         *
-        * Removes the configured value from the stored cache in $a->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
@@ -121,8 +128,8 @@ class Config extends BaseObject
         */
        public static function delete($family, $key)
        {
-               if (empty(self::$adapter)) {
-                       self::init();
+               if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
+                       self::$cache->delete($family, $key);
                }
 
                return self::$adapter->delete($family, $key);