dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Display memcached server status : #PSFV-631

Browse Source
This commit is contained in:
bMancone
2012-04-05 13:44:18 +00:00
parent cb88cf2c58
commit 2235fdb440
2 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+37 -1
View File
@@ -89,6 +89,7 @@
</div>
<div class="margin-form">
<input type="submit" value="{l s=' Add Server '}" name="submitAddServer" class="button" />
<input type="button" value="{l s=' Test Server '}" id="testMemcachedServer" class="button" />
</div>
</form>
</div>
@@ -145,12 +146,47 @@
$('#caching_system').change(function() {
showMemcached();
});
$('#addMemcachedServer').click(function() {
$('#formMemcachedServer').show();
return false;
});
$('#testMemcachedServer').click(function() {
var host = $('input:text[name=memcachedIp]').val();
var port = $('input:text[name=memcachedPort]').val();
if (host && port)
{
$.ajax({
url: 'index.php',
data:
{
controller: 'adminperformance',
token: '{$token}',
action: 'test_server',
sHost: host,
sPort: port,
ajax: true
},
context: document.body,
dataType: 'json',
context: this,
async: false,
success: function(data)
{
if (data)
{
var color = data != 0 ? 'green' : 'red';
$('#formMemcachedServerStatus').show();
$('input:text[name=memcachedIp]').css('background', color);
$('input:text[name=memcachedPort]').css('background', color);
}
}
});
}
return false;
});
$('input[name="smarty_force_compile"], input[name="smarty_cache"], input[name="smarty_console"]').change(function(){
$('#smarty_up').val(1);
});
controllers/admin/AdminPerformanceController.php
+28 -4
View File
@@ -503,13 +503,13 @@ class AdminPerformanceControllerCore extends AdminController
public function initContent()
{
if (!extension_loaded('memcache'))
$this->warnings[] = $this->l('To use Memcached, you must install the Memcache PECL extension on your server.').'
$this->warnings[] = $this->l('To use Memcached, you must install the Memcache PECL extension on your server.').'
<a href="http://www.php.net/manual/en/memcache.installation.php">http://www.php.net/manual/en/memcache.installation.php</a>';
if (!extension_loaded('apc'))
$this->warnings[] = $this->l('To use APC, you must install the APC PECL extension on your server.').'
$this->warnings[] = $this->l('To use APC, you must install the APC PECL extension on your server.').'
<a href="http://fr.php.net/manual/fr/apc.installation.php">http://fr.php.net/manual/fr/apc.installation.php</a>';
if (!extension_loaded('xcache'))
$this->warnings[] = $this->l('To use Xcache, you must install the Xcache extension on your server.').'
$this->warnings[] = $this->l('To use Xcache, you must install the Xcache extension on your server.').'
<a href="http://xcache.lighttpd.net">http://xcache.lighttpd.net</a>';
if (!is_writable(_PS_CACHEFS_DIRECTORY_))
@@ -759,6 +759,30 @@ class AdminPerformanceControllerCore extends AdminController
else
return parent::postProcess();
}
public function ajaxProcess()
{
if (Tools::isSubmit('action') && Tools::getValue('action') == 'test_server')
{
$host = pSQL(Tools::getValue('sHost', ''));
$port = (int)Tools::getValue('sPort', 0);
if ($host != '' && $port != 0)
{
$res = 0;
if (function_exists('memcache_get_server_status') &&
function_exists('memcache_connect') &&
@fsockopen($host, $port))
{
$memcache = @memcache_connect($host, $port);
$res = @memcache_get_server_status($memcache, $host, $port);
}
die(Tools::jsonEncode(array($res)));
}
}
die;
}
}