aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acm
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-06-11 01:47:50 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-06-11 01:47:50 +0200
commitb9f4240c103734b33aeab809312fcef8e32c396e (patch)
tree2d9e8f5e2fbca0286121c1067b06ee88922c7bbf /phpBB/includes/acm
parent065bcde662c1bc4e6f3d3740e13c500849d1c027 (diff)
downloadforums-b9f4240c103734b33aeab809312fcef8e32c396e.tar
forums-b9f4240c103734b33aeab809312fcef8e32c396e.tar.gz
forums-b9f4240c103734b33aeab809312fcef8e32c396e.tar.bz2
forums-b9f4240c103734b33aeab809312fcef8e32c396e.tar.xz
forums-b9f4240c103734b33aeab809312fcef8e32c396e.zip
[ticket/10110] Remove multi-server syntax from Redis ACM.
PHPBB3-10110
Diffstat (limited to 'phpBB/includes/acm')
-rw-r--r--phpBB/includes/acm/acm_redis.php12
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'))
{