Removing rrd_dir when rrdcached is being used

librenms-plugins · Jul 23, 2022 · b18db6d · b18db6d
1 parent 018334a
commit b18db6d
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/map-poller.php b/map-poller.php
@@ -56,11 +56,19 @@
 if (is_dir($conf_dir)) {
     if ($dh = opendir($conf_dir)) {
 		while (($file = readdir($dh)) !== false) {
-			if ("." != $file && ".." != $file && ".htaccess" != $file && "index.php" != $file) {
-			    	$cmd = "php ./weathermap.php --config $conf_dir/$file --base-href $basehref --chdir ".$config['rrd_dir'];
-                                if (!empty($config['rrdcached'])) {
-                                    $cmd = $cmd." --daemon ".$config['rrdcached'];
-                                }
+			if ("." != $file && ".." != $file && ".htaccess" != $file && "index.php" != $file) 
+			{
+				$cmd = "php ./poller.php --config $conf_dir/$file --base-href $basehref";
+
+				if (!empty($config['rrdcached'])) 
+				{
+					$cmd = $cmd." --daemon ".$config['rrdcached'];
+				}
+				else
+				{
+					$cmd = $cmd." --chdir ".$config['rrd_dir'];
+				}
+
 				$fp = popen($cmd, 'r');
 				while (!feof($fp)) {
 					$read = fgets($fp);