summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Telatynski <7t3chguy@gmail.com>2015-04-14 20:40:31 +0100
committerMichael Telatynski <7t3chguy@gmail.com>2015-04-15 21:24:38 +0100
commit8ebf9de3f840f28f7c765cdf834369a46bcf8bea (patch)
tree42a691211c69fafdaf05c8ac9fd46c2b275bf76d
parent2a683369526e33ea495ecce47a8de812f3320bc2 (diff)
downloadnextcloud-server-8ebf9de3f840f28f7c765cdf834369a46bcf8bea.tar.gz
nextcloud-server-8ebf9de3f840f28f7c765cdf834369a46bcf8bea.zip
Memcache\Redis Add DB Select Functionality
-rw-r--r--config/config.sample.php5
-rw-r--r--lib/private/memcache/redis.php5
2 files changed, 8 insertions, 2 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index e3b81f69f6b..61ae59542d4 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -420,7 +420,7 @@ $CONFIG = array(
*/
/**
- * Checks an app before install whether it uses private APIs instead of the
+ * Checks an app before install whether it uses private APIs instead of the
* proper public APIs. If this is set to true it will only allow to install or
* enable apps that pass this check.
*/
@@ -831,7 +831,8 @@ $CONFIG = array(
'redis' => array(
'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
'port' => 6379,
- 'timeout' => 0.0
+ 'timeout' => 0.0,
+ 'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
),
/**
diff --git a/lib/private/memcache/redis.php b/lib/private/memcache/redis.php
index 62186d3c4ec..e7425726b2b 100644
--- a/lib/private/memcache/redis.php
+++ b/lib/private/memcache/redis.php
@@ -51,7 +51,12 @@ class Redis extends Cache {
} else {
$timeout = 0.0; // unlimited
}
+
self::$cache->connect( $host, $port, $timeout );
+
+ if (isset($config['dbindex'])) {
+ self::$cache->select( $config['dbindex'] );
+ }
}
}