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

Force relative rrd-paths by prefixing rrd_dir with './'

Browse Source 
Allow empty string as rrdcached_dir values
This commit is contained in:
f0o
2015-05-08 12:55:00 +00:00
parent bf5ff217ce
commit 1ed51dad65
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/rrdtool.inc.php
View File

@ -108,8 +108,8 @@ function rrdtool_graph($graph_file, $options)
if ($config['rrdcached']) if ($config['rrdcached'])
{ {
if (isset($config['rrdcached_dir']) && $config['rrdcached_dir'] !== FALSE) { if (isset($config['rrdcached_dir']) && $config['rrdcached_dir'] !== FALSE) {
$options = str_replace($config['rrd_dir']."/",$config['rrdcached_dir']."/",$options); $options = str_replace($config['rrd_dir']."/","./".$config['rrdcached_dir']."/",$options);
$options = str_replace($config['rrd_dir'] ,$config['rrdcached_dir']."/",$options); $options = str_replace($config['rrd_dir'] ,"./".$config['rrdcached_dir']."/",$options);
} }
fwrite($rrd_pipes[0], "graph --daemon " . $config['rrdcached'] . " $graph_file $options"); fwrite($rrd_pipes[0], "graph --daemon " . $config['rrdcached'] . " $graph_file $options");
} else { } else {
@ -157,8 +157,8 @@ function rrdtool($command, $filename, $options)
if ($command != "create" && $config['rrdcached']) if ($command != "create" && $config['rrdcached'])
{ {
if (isset($config['rrdcached_dir']) && $config['rrdcached_dir'] !== FALSE) { if (isset($config['rrdcached_dir']) && $config['rrdcached_dir'] !== FALSE) {
$filename = str_replace($config['rrd_dir']."/",$config['rrdcached_dir']."/",$filename); $filename = str_replace($config['rrd_dir']."/","./".$config['rrdcached_dir']."/",$filename);
$filename = str_replace($config['rrd_dir'] ,$config['rrdcached_dir']."/",$filename); $filename = str_replace($config['rrd_dir'] ,"./".$config['rrdcached_dir']."/",$filename);
} }
$cmd = "$command $filename $options --daemon " . $config['rrdcached']; $cmd = "$command $filename $options --daemon " . $config['rrdcached'];
} else { } else {