nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-01 08:03:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix filename for rrdcached usage."

Browse Source
This commit is contained in:
Neil Lathwood
2015-04-27 09:39:11 +01:00
parent d673b4f14c
commit f12cc78c04
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/rrdtool.inc.php
+2 -9
View File
@@ -150,17 +150,10 @@ function rrdtool($command, $filename, $options)
{ {
global $config, $debug, $rrd_pipes, $console_color; global $config, $debug, $rrd_pipes, $console_color;
$cmd = "$command $filename $options";
if ($command != "create" && $config['rrdcached']) if ($command != "create" && $config['rrdcached'])
{ {
$filename = str_replace($config['install_dir'],"",$filename); $cmd .= " --daemon " . $config['rrdcached'];
//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";
} }
if ($config['norrd']) if ($config['norrd'])