diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2015-04-16 09:30:07 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2015-04-16 09:30:07 +0200 |
| commit | 2e06cf49a5ff2eca644b66aa9eec299830eb67bd (patch) | |
| tree | 1b5d2065ede2343ea555c6903e8afe1cf6a3de79 | |
| parent | 8606b7ca669674a87a63c58a994585be0b0e1102 (diff) | |
| parent | 8ebf9de3f840f28f7c765cdf834369a46bcf8bea (diff) | |
| download | nextcloud-server-2e06cf49a5ff2eca644b66aa9eec299830eb67bd.tar.gz nextcloud-server-2e06cf49a5ff2eca644b66aa9eec299830eb67bd.zip | |
Merge pull request #15623 from t3chguy/master
Redis DB Index via Select
| -rw-r--r-- | config/config.sample.php | 5 | ||||
| -rw-r--r-- | lib/private/memcache/redis.php | 5 |
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'] ); + } } } |