mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 12:34:59 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10110] Remove multi-server syntax from Redis ACM.

Conflicts:
	phpBB/includes/cache/driver/redis.php
This commit is contained in:
Igor Wiedler 2011-06-11 12:06:29 +02:00
commit 0cad4ed49f
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/cache/driver/redis.php vendored
View File

@ -25,12 +25,6 @@ if (!defined('PHPBB_ACM_REDIS_HOST'))
define('PHPBB_ACM_REDIS_HOST', 'localhost'); 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 * ACM for Redis
* *
@ -51,11 +45,7 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory
parent::__construct(); parent::__construct();
$this->redis = new Redis(); $this->redis = new Redis();
foreach (explode(',', PHPBB_ACM_REDIS) as $server) $this->redis->connect(PHPBB_ACM_REDIS_HOST, PHPBB_ACM_REDIS_PORT);
{
$parts = explode('/', $server);
$this->redis->connect(trim($parts[0]), trim($parts[1]));
}
if (defined('PHPBB_ACM_REDIS_PASSWORD')) if (defined('PHPBB_ACM_REDIS_PASSWORD'))
{ {