fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 20:12:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Allow connection to Memcached and Redis via unix socket

Browse source
This commit is contained in:
Kijin Sung 2017-09-11 17:33:19 +09:00
parent 363f2feeac
commit 1042479d5b
4 changed files with 93 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

26
common/framework/drivers/cache/memcached.php vendored
View file

@ -45,10 +45,17 @@ class Memcached implements \Rhymix\Framework\Drivers\CacheInterface
foreach ($config as $url) foreach ($config as $url)
{ {
$info = parse_url($url); if (starts_with('/', $url))
if (isset($info['host']) && isset($info['port']))
{ {
$this->_conn->addServer($info['host'], $info['port']); $this->_conn->addServer($url, 0);
}
else
{
$info = parse_url($url);
if (isset($info['host']) && isset($info['port']))
{
$this->_conn->addServer($info['host'], $info['port']);
}
} }
} }
} }
@ -107,10 +114,17 @@ class Memcached implements \Rhymix\Framework\Drivers\CacheInterface
foreach ($config as $url) foreach ($config as $url)
{ {
$info = parse_url($url); if (starts_with('/', $url))
if (isset($info['host']) && isset($info['port']))
{ {
$conn->addServer($info['host'], $info['port']); $conn->addServer($url, 0);
}
else
{
$info = parse_url($url);
if (isset($info['host']) && isset($info['port']))
{
$conn->addServer($info['host'], $info['port']);
}
} }
} }

72
common/framework/drivers/cache/redis.php vendored
View file

@ -32,21 +32,35 @@ class Redis implements \Rhymix\Framework\Drivers\CacheInterface
$this->_conn = null; $this->_conn = null;
foreach ($config as $url) foreach ($config as $url)
{ {
$info = parse_url($url); if (preg_match('!^(/.+)(#[0-9]+)?$!', $url, $matches))
if (isset($info['host']) && isset($info['port']))
{ {
$this->_conn = new \Redis; $this->_conn = new \Redis;
$this->_conn->connect($info['host'], $info['port'], 0.15); $this->_conn->connect($matches[1]);
if(isset($info['user']) || isset($info['pass'])) $this->_conn->select($matches[2] ? substr($matches[2], 1) : 0);
{
$this->_conn->auth(isset($info['user']) ? $info['user'] : $info['pass']);
}
if(isset($info['path']) && $dbnum = intval(substr($info['path'], 1)))
{
$this->_conn->select($dbnum);
}
break; break;
} }
else
{
$info = parse_url($url);
if (isset($info['host']) && isset($info['port']))
{
$this->_conn = new \Redis;
$this->_conn->connect($info['host'], $info['port'], 0.15);
if(isset($info['user']) || isset($info['pass']))
{
$this->_conn->auth(isset($info['user']) ? $info['user'] : $info['pass']);
}
if(isset($info['fragment']) && $dbnum = intval($info['fragment']))
{
$this->_conn->select($dbnum);
}
elseif(isset($info['path']) && $dbnum = intval(substr($info['path'], 1)))
{
$this->_conn->select($dbnum);
}
break;
}
}
} }
} }
catch (\RedisException $e) catch (\RedisException $e)
@ -97,20 +111,34 @@ class Redis implements \Rhymix\Framework\Drivers\CacheInterface
$conn = new \Redis; $conn = new \Redis;
foreach ($config as $url) foreach ($config as $url)
{ {
$info = parse_url($url); if (preg_match('!^(/.+)(#[0-9]+)?$!', $url, $matches))
if (isset($info['host']) && isset($info['port']))
{ {
$conn->connect($info['host'], $info['port'], 0.15); $conn = new \Redis;
if(isset($info['user']) || isset($info['pass'])) $conn->connect($matches[1]);
{ $conn->select($matches[2] ? substr($matches[2], 1) : 0);
$conn->auth(isset($info['user']) ? $info['user'] : $info['pass']);
}
if(isset($info['path']) && $dbnum = intval(substr($info['path'], 1)))
{
$conn->select($dbnum);
}
return true; return true;
} }
else
{
$info = parse_url($url);
if (isset($info['host']) && isset($info['port']))
{
$conn->connect($info['host'], $info['port'], 0.15);
if(isset($info['user']) || isset($info['pass']))
{
$conn->auth(isset($info['user']) ? $info['user'] : $info['pass']);
}
if(isset($info['fragment']) && $dbnum = intval($info['fragment']))
{
$conn->select($dbnum);
}
elseif(isset($info['path']) && $dbnum = intval(substr($info['path'], 1)))
{
$conn->select($dbnum);
}
return true;
}
}
} }
return false; return false;
} }

12
modules/admin/admin.admin.controller.php
View file

@ -725,10 +725,18 @@ class adminAdminController extends admin
{ {
if ($vars->object_cache_type === 'memcached' || $vars->object_cache_type === 'redis') if ($vars->object_cache_type === 'memcached' || $vars->object_cache_type === 'redis')
{ {
$cache_servers = array($vars->object_cache_type . '://' . $vars->object_cache_host . ':' . intval($vars->object_cache_port)); if (starts_with('/', $vars->object_cache_host))
{
$cache_servers = array($vars->object_cache_host);
}
else
{
$cache_servers = array($vars->object_cache_type . '://' . $vars->object_cache_host . ':' . intval($vars->object_cache_port));
}
if ($vars->object_cache_type === 'redis') if ($vars->object_cache_type === 'redis')
{ {
$cache_servers[0] .= '/' . intval($vars->object_cache_dbnum); $cache_servers[0] .= '#' . intval($vars->object_cache_dbnum);
} }
} }
else else

17
modules/admin/admin.admin.view.php
View file

@ -519,10 +519,19 @@ class adminAdminView extends admin
if ($cache_servers) if ($cache_servers)
{ {
Context::set('object_cache_host', parse_url(array_first($cache_servers), PHP_URL_HOST) ?: null); if (preg_match('!^(/.+)(#[0-9]+)?$!', array_first($cache_servers), $matches))
Context::set('object_cache_port', parse_url(array_first($cache_servers), PHP_URL_PORT) ?: null); {
$cache_dbnum = preg_replace('/[^\d]/', '', parse_url(array_first($cache_servers), PHP_URL_PATH)); Context::set('object_cache_host', $matches[1]);
Context::set('object_cache_dbnum', $cache_dbnum === '' ? 1 : intval($cache_dbnum)); Context::set('object_cache_port', 0);
Context::set('object_cache_dbnum', $matches[2] ? substr($matches[2], 1) : 0);
}
else
{
Context::set('object_cache_host', parse_url(array_first($cache_servers), PHP_URL_HOST) ?: null);
Context::set('object_cache_port', parse_url(array_first($cache_servers), PHP_URL_PORT) ?: null);
$cache_dbnum = preg_replace('/[^\d]/', '', parse_url(array_first($cache_servers), PHP_URL_FRAGMENT) ?: parse_url(array_first($cache_servers), PHP_URL_PATH));
Context::set('object_cache_dbnum', $cache_dbnum === '' ? 1 : intval($cache_dbnum));
}
} }
else else
{ {