Changeset 851

Timestamp:

Oct 14, 2017, 12:18:10 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Insert new network interface signal lines in transaction.
• Fixed: Correctly get wireless link speed even from new RouterOS versions.

Location:

trunk

Files:

• Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (4 diffs)
• Packages/Common/Database.php (modified) (1 diff)

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -6 +6 @@
   {
     $Time = time();
+    $Queries = array();
 
     // Load netwatch status from all DHCP routers
@@ -31 +32 @@
           $DbRow = $DbResult->fetch_assoc();
           $Interface = $DbRow['Id'];
-        } else $Interface = null;
+        } else $Interface = 'NULL';
 
         if(strpos($Properties['signal-strength'], '@') === false)
@@ -42 +43 @@
             else $Strength = $Parts[0];
         }
-        $RateRx = substr($Properties['rx-rate'], 0, -3); // without MHz
-        $RateTx = substr($Properties['tx-rate'], 0, -3); // without MHz
-        $this->Database->insert('NetworkSignal', array('MAC' => $Properties['mac-address'],
-            'Value' => $Strength, 'RateRx' => $RateRx, 'RateTx' => $RateTx,
-            'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface, 'Device' => $Device['Id']));
+        $RateRx = $this->StripUnits($Properties['rx-rate']);
+        $RateTx = $this->StripUnits($Properties['tx-rate']);
+        $Queries[] = 'INSERT INTO `NetworkSignal` (`MAC`, `Value`, `RateRx`, `RateTx`, `Time`, `Interface`, `Device`) VALUES '.
+          '("'.$Properties['mac-address'].'", '.$Strength.', '.$RateRx.', '.$RateTx.', "'.
+          TimeToMysqlDateTime($Time).'", '.$Interface.', '.$Device['Id'].')';
         /*
          $DbResult = $this->Database->select('Measure', 'Id', '`Name` = "'.$Properties['mac-address'].'"');
@@ -63 +64 @@
       }
     }
+    $this->Database->Transaction($Queries);
+  }
+  
+  function StripUnits($Value)
+  {
+    if (strpos($Value, '-') !== false) $Value = substr($Value, 0, strpos($Value, '-') - 1); // without channel info
+    if (substr($Value, -3, 3) == "MHz") $Value = substr($Value, 0, -3); // without MHz unit
+    if (substr($Value, -4, 4) == "Mbps") $Value = substr($Value, 0, -4); // without Mbps unit    
+    if (substr($Value, -3, 3) == "Mbp") $Value = substr($Value, 0, -3); // without Mbp unit    
+    if (substr($Value, -1, 1) == "M") $Value = substr($Value, 0, -1); // without M unit
+    return($Value);
   }
 

trunk/Packages/Common/Database.php

@@ -202 +202 @@
   {
   }
+  
+  public function Transaction($Queries)
+  {
+      $this->PDO->beginTransaction();
+      foreach ($Queries as $Query)
+      {
+        $Statement = $this->PDO->prepare($Query);
+        $Statement->execute();
+      }          
+      $this->PDO->commit();
+  }
 }