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

Fix filename for rrdcached usage.

Browse Source
This commit is contained in:
f0o
2015-04-20 15:57:26 +00:00
parent 6e7fcda0a0
commit f518ebd0ec
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
includes/rrdtool.inc.php
View File

@@ -150,10 +150,17 @@ 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'])
{ {
$cmd .= " --daemon " . $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";
} }
if ($config['norrd']) if ($config['norrd'])