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 remote rrdtool_check_rrd_exists() calls (#4196)

Browse Source 
It was comparing with the full name when rrdcached only printed out the relative name.
Thanks mikmak on irc for lots of troubleshooting.
This commit is contained in:
Tony Murray
2016-08-24 16:42:50 -05:00
committed by Neil Lathwood
parent 1055003d3f
commit 111d967e7d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/rrdtool.inc.php
View File

@@ -260,7 +260,8 @@ function rrdtool_check_rrd_exists($filename)
global $config; global $config;
if ($config['rrdcached'] && version_compare($config['rrdtool_version'], '1.5', '>=')) { if ($config['rrdcached'] && version_compare($config['rrdtool_version'], '1.5', '>=')) {
$chk = rrdtool('last', $filename, ''); $chk = rrdtool('last', $filename, '');
return strpos(implode($chk), "$filename': No such file or directory") === false; $filename = str_replace(array($config['rrd_dir'].'/', $config['rrd_dir']), '', $filename);
return !str_contains(implode($chk), "$filename': No such file or directory");
} else { } else {
return is_file($filename); return is_file($filename);
} }