From b85435dadd3471965a7e5d02a5f104b961b78345 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sun, 28 Feb 2010 01:44:34 +0000
Subject: [PATCH] Put device rebooted event in the event log before other
 device events

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

diff --git a/poll-device.php b/poll-device.php
index 829ec8887..0ac96ff5d 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -72,6 +72,29 @@ while ($device = mysql_fetch_array($device_query)) {
     $status = "0";
   }
 
+  if ($uptime) 
+  {
+    if ( $uptime < $device['uptime'] ) {
+      notify($device,"Device rebooted: " . $device['hostname'],  "Device Rebooted : " . $device['hostname'] . " " . formatUptime($uptime) . " ago.");
+      eventlog('Device rebooted', $device['device_id']);
+    }
+
+    $uptimerrd    = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";
+
+    if (!is_file($uptimerrd)) {
+      $woo = shell_exec($config['rrdtool'] . " create $uptimerrd \
+        DS:uptime:GAUGE:600:0:U \
+        RRA:AVERAGE:0.5:1:600 \
+        RRA:AVERAGE:0.5:6:700 \
+        RRA:AVERAGE:0.5:24:775 \
+        RRA:AVERAGE:0.5:288:797");
+    }
+    rrdtool_update($uptimerrd, "N:$uptime");
+
+    $update .= $seperator . "`uptime` = '$uptime'";
+    $seperator = ", ";
+  } 
+
   if ( $device['status'] != $status ) {
     $update .= $seperator . "`status` = '$status'";
     $seperator = ", ";
@@ -168,28 +191,6 @@ while ($device = mysql_fetch_array($device_query)) {
     eventlog("Hardware -> $hardware", $device['device_id']);
   }
 
-  if ($uptime) 
-  {
-    if ( $uptime < $device['uptime'] ) {
-      notify($device,"Device rebooted: " . $device['hostname'],  "Device Rebooted : " . $device['hostname'] . " " . formatUptime($uptime) . " ago.");
-      eventlog('Device rebooted', $device['device_id']);
-    }
-
-    $uptimerrd    = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";
-
-    if (!is_file($uptimerrd)) {
-      $woo = shell_exec($config['rrdtool'] . " create $uptimerrd \
-        DS:uptime:GAUGE:600:0:U \
-        RRA:AVERAGE:0.5:1:600 \
-        RRA:AVERAGE:0.5:6:700 \
-        RRA:AVERAGE:0.5:24:775 \
-        RRA:AVERAGE:0.5:288:797");
-    }
-    rrdtool_update($uptimerrd, "N:$uptime");
-
-    $update .= $seperator . "`uptime` = '$uptime'";
-    $seperator = ", ";
-  } 
   $update .= $seperator . "`last_polled` = NOW()";
   $seperator = ", ";
   $polled_devices++;