mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2019-11-27 08:10:49 +01:00
parent bf6bcad1cb cbbba2dcc7
commit f26c79621b
11 changed files with 128 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
phpBB/phpbb/cache/driver/memcache.php vendored
View File

@@ -1,122 +0,0 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\cache\driver;
if (!defined('PHPBB_ACM_MEMCACHE_PORT'))
{
define('PHPBB_ACM_MEMCACHE_PORT', 11211);
}
if (!defined('PHPBB_ACM_MEMCACHE_COMPRESS'))
{
define('PHPBB_ACM_MEMCACHE_COMPRESS', false);
}
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
*/
class memcache extends \phpbb\cache\driver\memory
{
var $extension = 'memcache';
var $memcache;
var $flags = 0;
function __construct()
{
// Call the parent constructor
parent::__construct();
$this->memcache = new \Memcache;
foreach (explode(',', PHPBB_ACM_MEMCACHE) as $u)
{
preg_match('#(.*)/(\d+)#', $u, $parts);
$this->memcache->addServer(trim($parts[1]), (int) trim($parts[2]));
}
$this->flags = (PHPBB_ACM_MEMCACHE_COMPRESS) ? MEMCACHE_COMPRESSED : 0;
}
/**
* {@inheritDoc}
*/
function unload()
{
parent::unload();
$this->memcache->close();
}
/**
* {@inheritDoc}
*/
function purge()
{
$this->memcache->flush();
parent::purge();
}
/**
* Fetch an item from the cache
*
* @access protected
* @param string $var Cache key
* @return mixed Cached data
*/
function _read($var)
{
return $this->memcache->get($this->key_prefix . $var);
}
/**
* Store data in the cache
*
* @access protected
* @param string $var Cache key
* @param mixed $data Data to store
* @param int $ttl Time-to-live of cached data
* @return bool True if the operation succeeded
*/
function _write($var, $data, $ttl = 2592000)
{
if (!$this->memcache->replace($this->key_prefix . $var, $data, $this->flags, $ttl))
{
return $this->memcache->set($this->key_prefix . $var, $data, $this->flags, $ttl);
}
return true;
}
/**
* Remove an item from the cache
*
* @access protected
* @param string $var Cache key
* @return bool True if the operation succeeded
*/
function _delete($var)
{
return $this->memcache->delete($this->key_prefix . $var);
}
}

22
phpBB/phpbb/cache/driver/memcached.php vendored
View File

@@ -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)
{
preg_match('#(.*)/(\d+)#', $u, $parts);
$this->memcached->addServer(trim($parts[1]), (int) trim($parts[2]));
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()))
{
trigger_error('Could not connect to memcached server(s).');
}
}