diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-18 17:06:43 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-18 17:06:43 +0100 |
| commit | 49607a0b2c134355abe924fccc06df07a985edef (patch) | |
| tree | ad5df1fe4deb38f25c24cab8e0e513b73eebd94e /phpBB/includes/acm/acm_memcache.php | |
| parent | d1e8f6a0d30f2d64b9fa78e76d447e884293f239 (diff) | |
| parent | da5c36fdeb15a23af426895b11a58051c7ee6997 (diff) | |
| download | forums-49607a0b2c134355abe924fccc06df07a985edef.tar forums-49607a0b2c134355abe924fccc06df07a985edef.tar.gz forums-49607a0b2c134355abe924fccc06df07a985edef.tar.bz2 forums-49607a0b2c134355abe924fccc06df07a985edef.tar.xz forums-49607a0b2c134355abe924fccc06df07a985edef.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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
Allow setting parent forums regardless of permission settings. (Bug #58415)
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 +?> |