mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added generic memcached support to dbFacile.*

Browse Source 
Remove now obsolete memcached code in:
  html/ajax_rulesuggest.php

Remove all the broken memcached code in:
  html/pages/device/health/mempool.inc.php
  html/pages/device/overview/generic/sensor.inc.php
  html/pages/device/overview/mempools.inc.php
  html/pages/device/port.inc.php
  html/pages/device/ports.inc.php
  html/pages/health/sensors.inc.php
  includes/polling/functions.inc.php
  includes/polling/mempools.inc.php
  includes/polling/ports.inc.php
  includes/polling/storage.inc.php
This commit is contained in:
Daniel Preussker
2015-09-27 19:29:34 +00:00
parent 28e1cfda22
commit 7832868dd6
15 changed files with 85 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
includes/definitions.inc.php
View File

@@ -30,6 +30,22 @@ else {
$database_db = mysql_select_db($config['db_name'], $database_link);
}
$config['time']['now'] = time();
$config['time']['now'] -= ($config['time']['now'] % 300);
if ($config['memcached']['enable'] === true) {
if (class_exists('Memcached')) {
$config['memcached']['ttl'] += $config['time']['now'];
$config['memcached']['resource'] = new Memcached();
$config['memcached']['resource']->addServer($config['memcached']['host'], $config['memcached']['port']);
}
else {
echo "WARNING: You have enabled memcached but have not installed the PHP bindings. Disabling memcached support.\n";
echo "Try 'apt-get install php5-memcached' or 'pecl install memcached'. You will need the php5-dev and libmemcached-dev packages to use pecl.\n\n";
$config['memcached']['enable'] = 0;
}
}
$clone = $config;
foreach (dbFetchRows('select config_name,config_value from config') as $obj) {
$clone = array_replace_recursive($clone, mergecnf($obj));
@@ -1703,22 +1719,7 @@ if (isset($_SERVER['HTTPS'])) {
$config['base_url'] = preg_replace('/^http:/', 'https:', $config['base_url']);
}
if ($config['memcached']['enable'] === true) {
if (class_exists('Memcached')) {
$memcache = new Memcached();
$memcache->addServer($config['memcached']['host'], $config['memcached']['port']);
$memcache->getStats();
}
else {
echo "WARNING: You have enabled memcached but have not installed the PHP bindings. Disabling memcached support.\n";
echo "Try 'apt-get install php5-memcached' or 'pecl install memcached'. You will need the php5-dev and libmemcached-dev packages to use pecl.\n\n";
$config['memcached']['enable'] = 0;
}
}
// Set some times needed by loads of scripts (it's dynamic, so we do it here!)
$config['time']['now'] = time();
$config['time']['now'] -= ($config['time']['now'] % 300);
$config['time']['fourhour'] = ($config['time']['now'] - 14400);
// time() - (4 * 60 * 60);
$config['time']['sixhour'] = ($config['time']['now'] - 21600);