Changeset 861 for trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

Timestamp:

Oct 2, 2019, 12:15:16 AM (5 years ago)

Author:

chronos

Message:

• Modified: Optimized netwatch inport for inserting data ti database.
• Fixed: RouterOS API to work with RouterOS newer than 6.43.

File:

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

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -43 +43 @@
 
     $Queries = array();
+    $QueriesInsert = array();
+    $QueriesUpdate = array();
     foreach($Interfaces as $Index => $Interface)
     {
       // Update last online time if still online
       if($Interface['NewOnline'])
-        $Queries[] = $this->Database->GetUpdate('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
+        $Queries[] = $this->Database->GetUpdate('NetworkInterface', '`Id` = '.$Interface['Id'],
           array('LastOnline' => TimeToMysqlDateTime($StartTime)));
 
@@ -53 +55 @@
       {
         // Online state changed
-        $Queries[] = 'INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
-         `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
+        $QueriesInsert[] = 'INSERT INTO `NetworkInterfaceUpDown` (`Interface`,'.
+          '`State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
           TimeToMysqlDateTime($StartTime).'", NULL)';
         // Update previous record duration in UpDown table
-        $Queries[] = 'UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
+        $QueriesUpdate[] = 'UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
           '`TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`) '.
           'AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` ASC LIMIT 1)) '.
@@ -65 +67 @@
       }
     }
+    echo("transakce insert\n");
+    $this->Database->Transaction($QueriesInsert);
+    echo("done\n");
     echo("transakce\n");
     $this->Database->Transaction($Queries);
+    echo("done\n");
+    echo("transakce\n");
+    $this->Database->Transaction($QueriesUpdate);
     echo("done\n");