diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-06-11 12:04:07 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-06-11 12:04:07 +0200 |
| commit | 76167c6b912fcb577d31b6b27090262512862c1b (patch) | |
| tree | 9410b64da70e11e1a2a6f9099b571ab0f42cd766 /phpBB | |
| parent | a33b0f015a38cc2f54938fd60ff6a5691c2e9e28 (diff) | |
| parent | b9f4240c103734b33aeab809312fcef8e32c396e (diff) | |
| download | forums-76167c6b912fcb577d31b6b27090262512862c1b.tar forums-76167c6b912fcb577d31b6b27090262512862c1b.tar.gz forums-76167c6b912fcb577d31b6b27090262512862c1b.tar.bz2 forums-76167c6b912fcb577d31b6b27090262512862c1b.tar.xz forums-76167c6b912fcb577d31b6b27090262512862c1b.zip | |
Merge remote-tracking branch 'bantu/ticket/10110' into develop-olympus
* bantu/ticket/10110:
[ticket/10110] Remove multi-server syntax from Redis ACM.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acm/acm_redis.php | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/phpBB/includes/acm/acm_redis.php b/phpBB/includes/acm/acm_redis.php index 8954b9d0e7..41533eaacb 100644 --- a/phpBB/includes/acm/acm_redis.php +++ b/phpBB/includes/acm/acm_redis.php @@ -31,12 +31,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 * @@ -57,11 +51,7 @@ class acm extends acm_memory parent::acm_memory(); $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')) { |