diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PROFILER][REDIS] Support database, auth on redis connection

Browse Source
This commit is contained in:
Stéphane PY 2013-01-10 17:46:24 +01:00
parent 7ab8e48373
commit d027f45833
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
View File

@ -17,6 +17,7 @@ use Redis;
* RedisProfilerStorage stores profiling information in Redis. * RedisProfilerStorage stores profiling information in Redis.
* *
* @author Andrej Hudec <pulzarraider@gmail.com> * @author Andrej Hudec <pulzarraider@gmail.com>
* @author Stephane PY <py.stephane1@gmail.com>
*/ */
class RedisProfilerStorage implements ProfilerStorageInterface class RedisProfilerStorage implements ProfilerStorageInterface
{ {
@ -213,19 +214,26 @@ class RedisProfilerStorage implements ProfilerStorageInterface
protected function getRedis() protected function getRedis()
{ {
if (null === $this->redis) { if (null === $this->redis) {
if (!preg_match('#^redis://(?(?=\[.*\])\[(.*)\]|(.*)):(.*)$#', $this->dsn, $matches)) { $data = parse_url($this->dsn);
throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use Redis with an invalid dsn "%s". The expected format is "redis://[host]:port".', $this->dsn));
}
$host = $matches[1] ?: $matches[2]; if (false === $data || !isset($data['scheme']) || $data['scheme'] !== 'redis' || !isset($data['host']) || !isset($data['port'])) {
$port = $matches[3]; throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use Redis with an invalid dsn "%s". The minimal expected format is "redis://[host]:port".', $this->dsn));
}
if (!extension_loaded('redis')) { if (!extension_loaded('redis')) {
throw new \RuntimeException('RedisProfilerStorage requires that the redis extension is loaded.'); throw new \RuntimeException('RedisProfilerStorage requires that the redis extension is loaded.');
} }
$redis = new Redis; $redis = new Redis;
$redis->connect($host, $port); $redis->connect($data['host'], $data['port']);
if (isset($data['path'])) {
$redis->select(substr($data['path'], 1));
}
if (isset($data['pass'])) {
$redis->auth($data['pass']);
}
$redis->setOption(self::REDIS_OPT_PREFIX, self::TOKEN_PREFIX); $redis->setOption(self::REDIS_OPT_PREFIX, self::TOKEN_PREFIX);