Changeset 264 for trunk

Timestamp:

Nov 25, 2009, 9:20:27 PM (15 years ago)

Author:

george

Message:

• Opraveno: Import stavu netwatch. * Opraveno: Chybné označení dokončení restartu konfigurace.

Location:

trunk/system/generators

Files:

• generate.php (modified) (2 diffs)
• netwatch_import.php (modified) (3 diffs)

trunk/system/generators/generate.php

@@ -5 +5 @@
 
 $Now = time();
-$DbResult = $Database->select('NetworkConfiguration', '*, UNIX_TIMESTAMP(LastTime)', '(Changed != 0) AND (Enabled = 1)');
+$DbResult = $Database->select('NetworkConfiguration', '*, UNIX_TIMESTAMP(LastTime)', '(Changed = 1) AND (Enabled = 1)');
 while($Service = $DbResult->fetch_assoc())
 {
@@ -24 +24 @@
     //echo("Done\n");
     $ExecutionTime = time() - $ExecutionStart;
-    $Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Changed' => 0, 'LastTime' => 'NOW()', 'ExecutionTime' => $ExecutionTime, 'Log' => implode("\n", $Output)));
+    $Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Changed' => 0, 'LastTime' => 'NOW()', 'ExecutionTime' => $ExecutionTime));
+    $Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Log' => implode("\n", $Output)));
   }
 }

trunk/system/generators/netwatch_import.php

@@ -15 +15 @@
   $Routerboard->HostName = $Subnet['DHCP'];
   $List = $Routerboard->ListGetPrint($Path, array('host', 'status'));
-  
   foreach($List as $Properties)
   {
@@ -25 +24 @@
         $Online = 1;
         $Values = array('Online' => $Online, 'LastOnline' => 'NOW()');
+        //echo($Properties['host']." up\n");
       } else 
       {
         $Online = 0;
         $Values = array('Online' => $Online);
+        //echo($Properties['host']." down\n");
       }
 
@@ -39 +40 @@
         $DbResult2 = $Database->select('NetworkInterfaceStat', '*', '(NetworkInterface="'.$InterfaceId.'") AND (Time = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
         if($DbResult2->num_rows == 0) $Database->query('REPLACE INTO NetworkInterfaceStat (NetworkInterface, Time) VALUES ("'.$InterfaceId.'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');          
-        $Database->query('UPDATE NetworkInterfaceStat SET Count = Count + 1 WHERE (NetworkInterface="'.$InterfaceId.'") AND (Time = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+        $Database->query('UPDATE NetworkInterfaceStat SET PingCount = PingCount + 1 WHERE (NetworkInterface="'.$InterfaceId.'") AND (Time = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
       }
     }