Changeset 667

Timestamp:

Jul 14, 2014, 10:15:00 PM (10 years ago)

Author:

chronos

Message:

• Opraveno: Skript pro import online stavu rozhraní a záznam změn.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (4 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -10 +10 @@
 $Period = 60; // every 60 seconds
 
+
 while(1)
 {
   $StartTime = time();
+
+  // Load all interfaces to memory
+  $Interfaces = array();
+  $DbResult = $System->Database->select('NetworkInterface', '`Id`, `LocalIP` AS `IP`, `Online`, 0 AS `NewOnline`');
+  while($DbRow = $DbResult->fetch_assoc())
+    $Interfaces[$DbRow['IP']] = $DbRow;
 
   // Load netwatch status from all DHCP routers
@@ -27 +34 @@
     foreach($List as $Properties)
     {
+      $IP = $Properties['host'];
       if($Properties['status'] == 'up') $Online = 1;
         else $Online = 0;
@@ -32 +40 @@
       if($Online)
       {
-        // Set only online state
-        $DbResult = $System->Database->select('NetworkInterface', '`Id`, `Online`', '`LocalIP` = "'.$Properties['host'].'";');
-        while($DbRow = $DbResult->fetch_assoc())
-        {
-          $LastOnline = $DbRow['Online'];
-          $Interface = $DbRow['Id'];
-
-          // Record state changes
-          if($Online != $LastOnline)
-          {
-            $System->Database->insert('NetworkInterfaceUpDown', array(
-              'Interface' => $Interface, 'State' => $Online, 'Time' => TimeToMysqlDateTime($StartTime)));
-          }
-        }
-
-        $DbResult = $System->Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"',
-          array('Online' => 1, 'LastOnline' => TimeToMysqlDateTime($StartTime)));
+        if(array_key_exists($IP, $Interfaces))
+          $Interfaces[$IP]['NewOnline'] = 1;
+          else echo('IP '.$IP.' not found.'."\n");
       }
     }
   }
 
-  // Set offline state for not updated interfaces
-  $DbResult = $System->Database->select('NetworkInterface', 'Id', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"');
+  foreach($Interfaces as $Index => $Interface)
+  {
+    // Update last online time if still online
+    if($Interface['NewOnline'])
+      $DbResult = $System->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
+        array('LastOnline' => TimeToMysqlDateTime($StartTime)));
+
+        if($Interface['Online'] != $Interface['NewOnline'])
+    {
+        // Online state changed
+      $System->Database->insert('NetworkInterfaceUpDown', array(
+        'Interface' => $Interface['Id'], 'State' => $Interface['NewOnline'],
+           'Time' => TimeToMysqlDateTime($StartTime)));
+      $System->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
+        array('Online' => $Interface['NewOnline']));
+    }
+  }
+
+  // Set offline all interfaces which were not updated as online
+  $DbResult = $System->Database->select('NetworkInterface', '*', '(`Online` = 1) AND '.
+    '(`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'")');
   while($DbRow = $DbResult->fetch_assoc())
   {
-    $System->Database->insert('NetworkInterfaceUpDown', array(
-      'Interface' => $DbRow['Id'], 'State' => 0, 'Time' => TimeToMysqlDateTime($StartTime)));
+        echo('IP '.$DbRow['LocalIP'].' online but time not updated.'."\n");
   }
-  $DbResult = $System->Database->update('NetworkInterface', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));
+  $DbResult = $System->Database->select('NetworkInterface', '*', '(`Online` = 0) AND '.
+    '(`LastOnline` >= "'.TimeToMysqlDateTime($StartTime).'")');
+  while($DbRow = $DbResult->fetch_assoc())
+  {
+    echo('IP '.$DbRow['LocalIP'].' not online but time updated.'."\n");
+  }
 
   // Update device online state
@@ -87 +104 @@
   sleep($Delay);
 }
+