diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-27 08:10:44 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-27 08:10:44 +0100 |
| commit | cbbba2dcc77c8c96340f00c7f01bb66227e8b778 (patch) | |
| tree | ff3b2927fc78e51d43c7dbb0ff39abf67e1f38a2 /phpBB/phpbb/cache/driver/memcached.php | |
| parent | a8e2f4256b0f1330db8eb799bb26624cf185c6d4 (diff) | |
| parent | 5ed02c21493ccbde7d5072cd74c0b118153f508c (diff) | |
| download | forums-cbbba2dcc77c8c96340f00c7f01bb66227e8b778.tar forums-cbbba2dcc77c8c96340f00c7f01bb66227e8b778.tar.gz forums-cbbba2dcc77c8c96340f00c7f01bb66227e8b778.tar.bz2 forums-cbbba2dcc77c8c96340f00c7f01bb66227e8b778.tar.xz forums-cbbba2dcc77c8c96340f00c7f01bb66227e8b778.zip | |
Merge pull request #5745 from marc1706/ticket/16223
[ticket/16223] Remove no longer supported memcache driver
Diffstat (limited to 'phpBB/phpbb/cache/driver/memcached.php')
| -rw-r--r-- | phpBB/phpbb/cache/driver/memcached.php | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/phpBB/phpbb/cache/driver/memcached.php b/phpBB/phpbb/cache/driver/memcached.php index 7d66759ec2..fbb587a369 100644 --- a/phpBB/phpbb/cache/driver/memcached.php +++ b/phpBB/phpbb/cache/driver/memcached.php @@ -50,12 +50,16 @@ class memcached extends \phpbb\cache\driver\memory /** * Memcached constructor + * + * @param string $memcached_servers Memcached servers string (optional) */ - public function __construct() + public function __construct($memcached_servers = '') { // Call the parent constructor parent::__construct(); + $memcached_servers = $memcached_servers ?: PHPBB_ACM_MEMCACHED; + $this->memcached = new \Memcached(); $this->memcached->setOption(\Memcached::OPT_BINARY_PROTOCOL, true); // Memcached defaults to using compression, disable if we don't want @@ -65,10 +69,20 @@ class memcached extends \phpbb\cache\driver\memory $this->memcached->setOption(\Memcached::OPT_COMPRESSION, false); } - foreach (explode(',', PHPBB_ACM_MEMCACHED) as $u) + $server_list = []; + foreach (explode(',', $memcached_servers) as $u) + { + if (preg_match('#(.*)/(\d+)#', $u, $parts)) + { + $server_list[] = [trim($parts[1]), (int) trim($parts[2])]; + } + } + + $this->memcached->addServers($server_list); + + if (empty($server_list) || empty($this->memcached->getStats())) { - preg_match('#(.*)/(\d+)#', $u, $parts); - $this->memcached->addServer(trim($parts[1]), (int) trim($parts[2])); + trigger_error('Could not connect to memcached server(s).'); } } |