mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'bantu/ticket/10110' into develop-olympus

Browse Source 
* bantu/ticket/10110:
  [ticket/10110] Remove multi-server syntax from Redis ACM.
This commit is contained in:
Igor Wiedler 2011-06-11 12:04:07 +02:00
commit 76167c6b91
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/acm/acm_redis.php
View File

@ -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'))
{