diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-18 17:04:14 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-18 17:04:14 +0100 |
| commit | da5c36fdeb15a23af426895b11a58051c7ee6997 (patch) | |
| tree | 7be932bcd5ebaa44c300867d37cf7a06f06d1506 /phpBB/includes/acm/acm_memcache.php | |
| parent | 10f81ee79fe20baae7eb0dcced0d7a48110c3f8b (diff) | |
| parent | c57c1f3fc606665fad6b31993c4a1481018b0915 (diff) | |
| download | forums-da5c36fdeb15a23af426895b11a58051c7ee6997.tar forums-da5c36fdeb15a23af426895b11a58051c7ee6997.tar.gz forums-da5c36fdeb15a23af426895b11a58051c7ee6997.tar.bz2 forums-da5c36fdeb15a23af426895b11a58051c7ee6997.tar.xz forums-da5c36fdeb15a23af426895b11a58051c7ee6997.zip | |
Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympus
* feature/arstechnica/memcache-multi-server:
[feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes.
[feature/memcache-multi-server] Adding support for multiple memcache servers to acm_memcache.php
Diffstat (limited to 'phpBB/includes/acm/acm_memcache.php')
| -rw-r--r-- | phpBB/includes/acm/acm_memcache.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/includes/acm/acm_memcache.php b/phpBB/includes/acm/acm_memcache.php index 52b8832749..e54fa36c38 100644 --- a/phpBB/includes/acm/acm_memcache.php +++ b/phpBB/includes/acm/acm_memcache.php @@ -37,6 +37,12 @@ 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); +} + /** * ACM for Memcached * @package acm @@ -54,7 +60,11 @@ class acm extends acm_memory parent::acm_memory(); $this->memcache = new Memcache; - $this->memcache->connect(PHPBB_ACM_MEMCACHE_HOST, PHPBB_ACM_MEMCACHE_PORT); + 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; } @@ -125,4 +135,4 @@ class acm extends acm_memory } } -?>
\ No newline at end of file +?> |