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

Merge pull request #865 from librenms/revert-839-rrdcached_fix

Browse Source 
Revert "Fix filename for rrdcached usage."
This commit is contained in:
Daniel Preussker
2015-04-27 10:43:25 +02:00
parent d673b4f14c f12cc78c04
commit 67e49dfd7d
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
includes/rrdtool.inc.php
View File

@ -150,17 +150,10 @@ function rrdtool($command, $filename, $options)
{
global $config, $debug, $rrd_pipes, $console_color;
$cmd = "$command $filename $options";
if ($command != "create" && $config['rrdcached'])
{
$filename = str_replace($config['install_dir'],"",$filename);
//Some people tend to end paths with '/', let's tolerate that
if( $filename[0] == "/" ) {
$filename = substr($filename,1);
}
$filename = str_replace("rrd/","",$filename); //Make sure you use -b /opt/librenms/rrd on your rrdcached!
$cmd = "$command $filename $options --daemon " . $config['rrdcached'];
} else {
$cmd = "$command $filename $options";
$cmd .= " --daemon " . $config['rrdcached'];
}
if ($config['norrd'])