X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FCache.php;h=cc77d9bfd0dc7e35598130af672287454ffdd25c;hb=1e96faca4c9825bf6a8d8a50dc37498b764b9a3d;hp=f1d1e11a542a26835b0700e25221fd36493ef044;hpb=a0451e1c6285212ed406b343b97e4a53859a673d;p=friendica.git

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index f1d1e11a54..cc77d9bfd0 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -4,8 +4,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
+use Friendica\Core\Cache\CacheDriverFactory;
 
 /**
  * @brief Class for storing data for a short time
@@ -24,25 +23,13 @@ class Cache extends \Friendica\BaseObject
 	/**
 	 * @var Cache\ICacheDriver
 	 */
-	static $driver = null;
+	private static $driver = null;
 
 	public static function init()
 	{
-		switch(Config::get('system', 'cache_driver', 'database')) {
-			case 'memcache':
-				$memcache_host = Config::get('system', 'memcache_host', '127.0.0.1');
-				$memcache_port = Config::get('system', 'memcache_port', 11211);
-
-				self::$driver = new Cache\MemcacheCacheDriver($memcache_host, $memcache_port);
-				break;
-			case 'memcached':
-				$memcached_hosts = Config::get('system', 'memcached_hosts', [['127.0.0.1', 11211]]);
-
-				self::$driver = new Cache\MemcachedCacheDriver($memcached_hosts);
-				break;
-			default:
-				self::$driver = new Cache\DatabaseCacheDriver();
-		}
+		$driver_name = Config::get('system', 'cache_driver', 'database');
+
+		self::$driver = CacheDriverFactory::create($driver_name);
 	}
 
 	/**