From 259fae2457e5ab950d713d9801cf92afab11bfa7 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Tue, 5 Jan 2010 21:54:13 +0000
Subject: [PATCH] really fix up/down issue

git-svn-id: http://www.observium.org/svn/observer/trunk@600 61d68cd4-352d-0410-923a-c4978735b2b8
---
 poll-device.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/poll-device.php b/poll-device.php
index d64da4c0d6..e3dc90ff63 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -154,18 +154,6 @@ while ($device = mysql_fetch_array($device_query)) {
     mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('" . $device['device_id'] . "', NULL, NOW(), 'Hardware -> $hardware')");
   }
 
-  if( $device['status'] != $status ) {
-    $update .= $seperator . "`status` = '$status'";
-    $seperator = ", ";
-    if ($status == '1') { $stat = "Up"; 
-      mysql_query("INSERT INTO alerts (importance, device_id, message) VALUES ('0', '" . $device['device_id'] . "', 'Device is up\n')");
-    } else { 
-      $stat = "Down"; 
-      mysql_query("INSERT INTO alerts (importance, device_id, message) VALUES ('9', '" . $device['device_id'] . "', 'Device is down\n')");
-    }
-    mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('" . $device['device_id'] . "', NULL, NOW(), 'Device status changed to $stat')");
-  }
-
   if ($uptime) {
 
     if( $uptime < $device['uptime'] ) {
@@ -208,6 +196,14 @@ while ($device = mysql_fetch_array($device_query)) {
     echo("Updating " . $device['hostname'] . "\n");
     $update_result = mysql_query($update_query);
   }
+
+  if( $device['status'] != $status ) {
+    $update .= $seperator . "`status` = '$status'";
+    $seperator = ", ";
+    mysql_query("INSERT INTO alerts (importance, device_id, message) VALUES ('0', '" . $device['device_id'] . "', 'Device is " . ($status == '1' ? 'up' : 'down') . "')");
+    mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('" . $device['device_id'] . "', NULL, NOW(), 'Device status changed to " . ($status == '1' ? 'Up' : 'Down') . "')");
+  }
+
 }   
 
 $poller_end = utime(); $poller_run = $poller_end - $poller_start; $poller_time = substr($poller_run, 0, 5);