Resolving issue #2140

cmd.php

@@ -59,11 +59,11 @@ function debug_level($host_id, $level) {
 	}
 }
 
-require(__DIR__ . '/include/cli_check.php');
-require($config['base_path'] . '/lib/snmp.php');
-require($config['base_path'] . '/lib/poller.php');
-require($config['base_path'] . '/lib/rrd.php');
-require($config['base_path'] . '/lib/ping.php');
+require_once(__DIR__ . '/include/cli_check.php');
+require_once($config['base_path'] . '/lib/snmp.php');
+require_once($config['base_path'] . '/lib/poller.php');
+require_once($config['base_path'] . '/lib/rrd.php');
+require_once($config['base_path'] . '/lib/ping.php');
 
 // let the poller server know about cmd.php being finished
 function record_cmdphp_done($pid = '') {

cmd_realtime.php

@@ -22,11 +22,11 @@
  +-------------------------------------------------------------------------+
 */
 
-require(__DIR__ . '/include/cli_check.php');
-require($config['base_path'] . '/lib/snmp.php');
-require($config['base_path'] . '/lib/poller.php');
-require($config['base_path'] . '/lib/rrd.php');
-require($config['base_path'] . '/lib/ping.php');
+require_once(__DIR__ . '/include/cli_check.php');
+require_once($config['base_path'] . '/lib/snmp.php');
+require_once($config['base_path'] . '/lib/poller.php');
+require_once($config['base_path'] . '/lib/rrd.php');
+require_once($config['base_path'] . '/lib/ping.php');
 
 ini_set('max_execution_time', '0');
 

lib/dsstats.php

@@ -817,25 +817,31 @@ function dsstats_rrdtool_init() {
    @arg $pipes - (array) An array of stdin and stdout pipes to read and write data from
    @returns - (string) The output from RRDtool */
 function dsstats_rrdtool_execute($command, $pipes) {
+	global $config;
 	$stdout = '';
 
 	if ($command == '') return;
 
 	$command .= "\r\n";
 	$return_code = fwrite($pipes[0], $command);
 
+	$return_reason = 'EOF';
 	while (!feof($pipes[1])) {
 		$stdout .= fgets($pipes[1], 4096);
 
 		if (substr_count($stdout, 'OK')) {
+			$return_reason = 'OK';
 			break;
 		}
 
 		if (substr_count($stdout, 'ERROR')) {
+			$return_reason = 'ERROR';
 			break;
 		}
 	}
 
+	$temp = tempnam($config['base_path'], 'dsstats');
+	file_put_contents("Command: $command\nReason: $return_reason\nOutput:\n$stdout", $temp);
 	if (strlen($stdout)) return $stdout;
 }
 

lib/installer.php

@@ -1,5 +1,5 @@
 <?php
-include(dirname(__FILE__) . '/../lib/poller.php');
+include_once(dirname(__FILE__) . '/../lib/poller.php');
 
 class Installer implements JsonSerializable {
 	const EXIT_DB_EMPTY = 1;