hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add settings check on redis and memcached

Browse Source
This commit is contained in:
Romain Neutron
2012-06-15 17:06:23 +02:00
parent 52798a9053
commit 61716677d2
2 changed files with 86 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/classes/module/console/fileEnsureDevSetting.class.php
View File

@@ -72,7 +72,7 @@ class module_console_fileEnsureDevSetting extends Command
$this->configuration = \Alchemy\Phrasea\Core\Configuration::build($specifications, $environnement);
$this->checkParse($output);
$output->writeln(sprintf("Will Ensure Production Settings on <info>%s</info>", $this->configuration->getEnvironnement()));
$output->writeln(sprintf("Will Ensure Development Settings on <info>%s</info>", $this->configuration->getEnvironnement()));
$this->runTests($output);
@@ -707,6 +707,8 @@ class module_console_fileEnsureDevSetting extends Command
default:
break;
case 'memcache':
case 'memcached':
case 'redis':
$required_options = array('host', 'port');
break;
}
@@ -762,7 +764,14 @@ class module_console_fileEnsureDevSetting extends Command
return false;
}
if ($Service->getDriver()->isServer()) {
try {
$driver = $Service->getDriver();
} catch (\Exception $e) {
return false;
}
if ($driver->isServer()) {
switch ($Service->getType()) {
default:
return false;
@@ -772,6 +781,38 @@ class module_console_fileEnsureDevSetting extends Command
return false;
}
break;
case 'memcached':
$ret = false;
try {
$memcached = new \Memcached();
$memcached->addServer($Service->getHost(), $Service->getPort());
$stats = $memcached->getStats();
if ( ! isset($stats[$key]) || ! $stats[$key]) {
throw new \Exception('Unable to connect to memcached server');
}
$ret = true;
} catch (\Exception $e) {
}
unset($memcached);
return $ret;
break;
case 'redis':
$ret = false;
try {
$redis = new \Redis();
if (@$redis->connect($Service->getHost(), $Service->getPort())) {
$ret = true;
}
} catch (\Exception $e) {
}
unset($redis);
return $ret;
break;
}
}

43
lib/classes/module/console/fileEnsureProductionSetting.class.php
View File

@@ -148,7 +148,6 @@ class module_console_fileEnsureProductionSetting extends Command
{
$cache = $this->configuration->getCache();
if ($this->probeCacheService($output, $cache)) {
if ($this->recommendedCacheService($output, $cache, true)) {
$work_message = '<info>Works !</info>';
@@ -705,6 +704,8 @@ class module_console_fileEnsureProductionSetting extends Command
default:
break;
case 'memcache':
case 'memcached':
case 'redis':
$required_options = array('host', 'port');
break;
}
@@ -760,7 +761,13 @@ class module_console_fileEnsureProductionSetting extends Command
return false;
}
if ($Service->getDriver()->isServer()) {
try {
$driver = $Service->getDriver();
} catch (\Exception $e) {
return false;
}
if ($driver->isServer()) {
switch ($Service->getType()) {
default:
return false;
@@ -770,6 +777,38 @@ class module_console_fileEnsureProductionSetting extends Command
return false;
}
break;
case 'memcached':
$ret = false;
try {
$memcached = new \Memcached();
$memcached->addServer($Service->getHost(), $Service->getPort());
$stats = $memcached->getStats();
if ( ! isset($stats[$key]) || ! $stats[$key]) {
throw new \Exception('Unable to connect to memcached server');
}
$ret = true;
} catch (\Exception $e) {
}
unset($memcached);
return $ret;
break;
case 'redis':
$ret = false;
try {
$redis = new \Redis();
if (@$redis->connect($Service->getHost(), $Service->getPort())) {
$ret = true;
}
} catch (\Exception $e) {
}
unset($redis);
return $ret;
break;
}
}