diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-06-11 12:06:29 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-06-11 12:06:29 +0200 |
| commit | 0cad4ed49f6272f029afad0fb613a8855f0a5b43 (patch) | |
| tree | 25a67d99394b41404d1e3ea37cbccd970ec6049a /phpBB/includes/cache | |
| parent | 9a44b5a26947ad03b4fd544687c23290a970379b (diff) | |
| parent | 76167c6b912fcb577d31b6b27090262512862c1b (diff) | |
| download | forums-0cad4ed49f6272f029afad0fb613a8855f0a5b43.tar forums-0cad4ed49f6272f029afad0fb613a8855f0a5b43.tar.gz forums-0cad4ed49f6272f029afad0fb613a8855f0a5b43.tar.bz2 forums-0cad4ed49f6272f029afad0fb613a8855f0a5b43.tar.xz forums-0cad4ed49f6272f029afad0fb613a8855f0a5b43.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10110] Remove multi-server syntax from Redis ACM.
Conflicts:
phpBB/includes/cache/driver/redis.php
Diffstat (limited to 'phpBB/includes/cache')
| -rwxr-xr-x | phpBB/includes/cache/driver/redis.php | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/phpBB/includes/cache/driver/redis.php b/phpBB/includes/cache/driver/redis.php index f0997c3cad..6362938a9e 100755 --- a/phpBB/includes/cache/driver/redis.php +++ b/phpBB/includes/cache/driver/redis.php @@ -25,12 +25,6 @@ if (!defined('PHPBB_ACM_REDIS_HOST')) define('PHPBB_ACM_REDIS_HOST', 'localhost'); } -if (!defined('PHPBB_ACM_REDIS')) -{ - //can define multiple servers with host1/port1,host2/port2 format - define('PHPBB_ACM_REDIS', PHPBB_ACM_REDIS_HOST . '/' . PHPBB_ACM_REDIS_PORT); -} - /** * ACM for Redis * @@ -51,12 +45,8 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory parent::__construct(); $this->redis = new Redis(); - foreach (explode(',', PHPBB_ACM_REDIS) as $server) - { - $parts = explode('/', $server); - $this->redis->connect(trim($parts[0]), trim($parts[1])); - } - + $this->redis->connect(PHPBB_ACM_REDIS_HOST, PHPBB_ACM_REDIS_PORT); + if (defined('PHPBB_ACM_REDIS_PASSWORD')) { if (!$this->redis->auth(PHPBB_ACM_REDIS_PASSWORD)) |