diff options
| author | mrkurt <kurt@mubble.net> | 2010-03-18 06:08:24 -0500 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-18 17:01:50 +0100 |
| commit | c57c1f3fc606665fad6b31993c4a1481018b0915 (patch) | |
| tree | 7be932bcd5ebaa44c300867d37cf7a06f06d1506 /phpBB/includes/acm | |
| parent | 559313eda60459ed7b73e790257321402824d35c (diff) | |
| download | forums-c57c1f3fc606665fad6b31993c4a1481018b0915.tar forums-c57c1f3fc606665fad6b31993c4a1481018b0915.tar.gz forums-c57c1f3fc606665fad6b31993c4a1481018b0915.tar.bz2 forums-c57c1f3fc606665fad6b31993c4a1481018b0915.tar.xz forums-c57c1f3fc606665fad6b31993c4a1481018b0915.zip | |
[feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes.
Host and ports are now represented like this in config:
host1/port1,host2/port2,host3/port3
Diffstat (limited to 'phpBB/includes/acm')
| -rw-r--r-- | phpBB/includes/acm/acm_memcache.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/phpBB/includes/acm/acm_memcache.php b/phpBB/includes/acm/acm_memcache.php index 5a96509d38..e54fa36c38 100644 --- a/phpBB/includes/acm/acm_memcache.php +++ b/phpBB/includes/acm/acm_memcache.php @@ -37,9 +37,10 @@ if (!defined('PHPBB_ACM_MEMCACHE_HOST')) define('PHPBB_ACM_MEMCACHE_HOST', 'localhost'); } -if (!defined('PHPBB_ACM_MEMCACHE')){ - //can define multiple servers with host1::port1,host2::port2 format - define('PHPBB_ACM_MEMCACHE', PHPBB_ACM_MEMCACHE_HOST . '::' . PHPBB_ACM_MEMCACHE_PORT); +if (!defined('PHPBB_ACM_MEMCACHE')) +{ + //can define multiple servers with host1/port1,host2/port2 format + define('PHPBB_ACM_MEMCACHE', PHPBB_ACM_MEMCACHE_HOST . '/' . PHPBB_ACM_MEMCACHE_PORT); } /** @@ -59,9 +60,10 @@ class acm extends acm_memory parent::acm_memory(); $this->memcache = new Memcache; - foreach(explode(',', PHPBB_ACM_MEMCACHE) as $u){ - $parts = explode('::', $u); - $this->memcache->addServer($parts[0], $parts[1]); + foreach(explode(',', PHPBB_ACM_MEMCACHE) as $u) + { + $parts = explode('/', $u); + $this->memcache->addServer(trim($parts[0]), trim($parts[1])); } $this->flags = (PHPBB_ACM_MEMCACHE_COMPRESS) ? MEMCACHE_COMPRESSED : 0; } |