X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FCache%2FRedisCacheDriver.php;h=ea4eb4390a629c9c2a9b42fef9baeddcc659df2b;hb=fa1f48e1711c64d42ddb0f72c7670fa28f56482d;hp=fcbfab548a6b2bfba0e74e150a7d7b5f505dd9e1;hpb=23be68e74df0a9a1f2571eab6655788ad028c67d;p=friendica.git

diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCacheDriver.php
index fcbfab548a..ea4eb4390a 100644
--- a/src/Core/Cache/RedisCacheDriver.php
+++ b/src/Core/Cache/RedisCacheDriver.php
@@ -2,9 +2,8 @@
 
 namespace Friendica\Core\Cache;
 
-use Friendica\Core\Cache;
-
 use Exception;
+use Friendica\Core\Cache;
 use Redis;
 
 /**
@@ -21,11 +20,13 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 	private $redis;
 
 	/**
-	 * @param string $redis_host
-	 * @param int    $redis_port
+	 * @param string  $redis_host
+	 * @param int     $redis_port
+	 * @param int     $redis_db (Default = 0, maximum is 15)
+	 * @param string? $redis_pw
 	 * @throws Exception
 	 */
-	public function __construct($redis_host, $redis_port)
+	public function __construct($redis_host, $redis_port, $redis_db = 0, $redis_pw = null)
 	{
 		if (!class_exists('Redis', false)) {
 			throw new Exception('Redis class isn\'t available');
@@ -36,6 +37,14 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 		if (!$this->redis->connect($redis_host, $redis_port)) {
 			throw new Exception('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
 		}
+
+		if (isset($redis_pw) && !$this->redis->auth($redis_pw)) {
+			throw new Exception('Cannot authenticate redis server at ' . $redis_host . ':' . $redis_port);
+		}
+
+		if ($redis_db !== 0 && !$this->redis->select($redis_db)) {
+			throw new Exception('Cannot switch to redis db ' . $redis_db . ' at ' . $redis_host . ':' . $redis_port);
+		}
 	}
 
 	/**
@@ -152,7 +161,7 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 					->exec();
 			} else {
 				$result = $this->redis->multi()
-					->set($cachekey, $newValue)
+					->set($cachekey, $newCached)
 					->exec();
 			}
 			return $result !== false;