updates and cleanups. fixed mysql query

git-svn-id: http://www.observium.org/svn/observer/trunk@514 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-11-11 16:02:58 +00:00
parent 070af9f831
commit 8040941635
3 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -91,7 +91,8 @@ function shorthost($hostname, $len=16) {
function rrdtool_update($rrdfile, $rrdupdate) {
global $config;
echo($config['rrdtool'] . " update $rrdfile $rrdupdate \n");
global $debug;
if($debug) { echo($config['rrdtool'] . " update $rrdfile $rrdupdate \n"); }
return shell_exec($config['rrdtool'] . " update $rrdfile $rrdupdate");
}
+1 -1
View File
@@ -12,7 +12,7 @@ while ($hrDevice = mysql_fetch_array($query)) {
$this_hrDevice = $hrDevice_array[$device[device_id]][$hrDevice[hrDeviceIndex]];
$update_query = "UPDATE `hrDevice` SET";
$update_query .= ", `hrDeviceStatus` = '".mres($this_hrDevice['hrDeviceStatus'])."'";
$update_query .= " `hrDeviceStatus` = '".mres($this_hrDevice['hrDeviceStatus'])."'";
$update_query .= ", `hrDeviceErrors` = '".mres($this_hrDevice['hrDeviceErrors'])."'";
$update_query .= ", `hrProcessorLoad` = '".mres($this_hrDevice['hrProcessorLoad'])."'";
$update_query .= " WHERE hrDevice_id = '".$hrDevice['hrDevice_id']."'";
+1 -1
View File
@@ -280,7 +280,7 @@ $poller_end = utime(); $poller_run = $poller_end - $poller_start; $poller_time =
$string = $argv[0] . " $doing " . date("F j, Y, G:i") . " - $i devices polled in $poller_time secs";
echo("$string\n");
shell_exec("echo '".$string."' >> /opt/observer/observer.log");
shell_exec("echo '".$string."' >> ".$config['install_dir']."/observer.log");
?>