From 4a152dab7bd3c053c951c2e2d26b2a1da9ff3279 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Tue, 16 Aug 2016 19:07:01 -0500 Subject: [PATCH] Fix rrdtool_check_rrd_exists() by removing the broken remote check. Maybe this can be re-implemented at a later time. --- includes/rrdtool.inc.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php index 48466b48f3..98c6810f24 100644 --- a/includes/rrdtool.inc.php +++ b/includes/rrdtool.inc.php @@ -210,20 +210,14 @@ function rrdtool($command, $filename, $options, $timeout = 0) /** * Checks if the rrd file exists on the server - * This will perform a remote check if using rrdcached and rrdtool >= 1.5 + * This will perform a remote check if using rrdcached and rrdtool >= 1.5 (broken) * * @param $filename * @return bool */ function rrdtool_check_rrd_exists($filename) { - global $config; - if ($config['rrdcached'] && version_compare($config['rrdtool_version'], '1.5', '>=')) { - $chk = rrdtool('last', $filename, '', 30); // wait up to 30 seconds - return strpos(implode($chk), "$filename': No such file or directory") === false; - } else { - return is_file($filename); - } + return is_file($filename); } /**