From 05a156dc2ffe7c25f3d8ae417a3c85a7adeaf998 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sun, 8 Apr 2007 12:23:45 +0000
Subject: [PATCH] Changing polling structure

git-svn-id: http://www.observium.org/svn/observer/trunk@67 61d68cd4-352d-0410-923a-c4978735b2b8
---
 cron.sh         | 1 -
 poll-device.php | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cron.sh b/cron.sh
index 495c7e4db..bf60eace9 100755
--- a/cron.sh
+++ b/cron.sh
@@ -3,7 +3,6 @@
 ./poll-reachability.php
 ./poll-device.php &
 ./poll-interface.php &
-./poll-temperatures.php &
 ./ips.php &
 ./check-services.php
 ./alerts.php
diff --git a/poll-device.php b/poll-device.php
index cd651fde3..f9fd3c372 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -19,6 +19,7 @@ while ($device = mysql_fetch_array($device_query)) {
     $snmpable = isSNMPable($hostname, $community, $snmpver);
   }
   if ($pingable !== FALSE && $snmpable !== FALSE ) {
+
     $newstatus = '1';
     $hardware = $device['hardware'];
     $version = $device['version'];
@@ -44,8 +45,6 @@ while ($device = mysql_fetch_array($device_query)) {
     $secs = $secs + ($mins * 60);
     $newuptime = $secs;
 
-    include("poll-device-netstats.php");    
-
     switch ($os) {
     case "FreeBSD":
     case "DragonFly":
@@ -143,6 +142,11 @@ while ($device = mysql_fetch_array($device_query)) {
       pollDevice();
     }   
     $newlocation = str_replace("\"","", $sysLocation); 
+  
+  include("includes/polling/temperatures.inc.php");
+
+  include("includes/polling/device-netstats.inc.php");
+
   } else {
     $newstatus = '0';
   }