Merge pull request #7250 from MrPetovan/bug/6410-normalize-message-button

[friendica.git] / src / Core / Cache / RedisCacheDriver.php

diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCacheDriver.php
index 55dc09156a980fba80d80326bdcfc306bd9ad8a2..ea4eb4390a629c9c2a9b42fef9baeddcc659df2b 100644 (file)
--- a/src/Core/Cache/RedisCacheDriver.php
+++ b/src/Core/Cache/RedisCacheDriver.php
@@ -20,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');
@@ -35,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);
+               }
        }
 
        /**
@@ -144,14 +154,14 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 
                $this->redis->watch($cachekey);
                // If the old value isn't what we expected, somebody else changed the key meanwhile
-               if ($this->get($cachekey) === $oldValue) {
+               if ($this->get($key) === $oldValue) {
                        if ($ttl > 0) {
                                $result = $this->redis->multi()
                                        ->setex($cachekey, $ttl, $newCached)
                                        ->exec();
                        } else {
                                $result = $this->redis->multi()
-                                       ->set($cachekey, $newValue)
+                                       ->set($cachekey, $newCached)
                                        ->exec();
                        }
                        return $result !== false;
@@ -169,7 +179,7 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 
                $this->redis->watch($cachekey);
                // If the old value isn't what we expected, somebody else changed the key meanwhile
-               if ($this->get($cachekey) === $value) {
+               if ($this->get($key) === $value) {
                        $result = $this->redis->multi()
                                ->del($cachekey)
                                ->exec();