diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-03-22 22:54:24 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-03-22 22:54:24 +0100 |
| commit | a5057c9f2568d30b413d4b14140f6ecaac6315d5 (patch) | |
| tree | cc814e87b4fc2b0295a3c277bdf133b2cf834674 /phpBB/includes/acm/acm_memcache.php | |
| parent | ae48c8ee9ecf7866e4fe1ca4d3390d69a1adc2b4 (diff) | |
| parent | b3ff3be0dc56fdf32a7ae34b271b9016efa99c3b (diff) | |
| download | forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar.gz forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar.bz2 forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar.xz forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.zip | |
Merge branch 'develop-olympus' into git-tools
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 +?> |