Changeset 975

Timestamp:

Jun 30, 2025, 11:36:29 AM (3 weeks ago)

Author:

chronos

Message:

• Modified: Improved RouterOS signal logging.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/NetworkConfigAirOS/Generators/Signal.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (5 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 973; // Subversion revision
+$Revision = 975; // Subversion revision
 $DatabaseRevision = 970; // SQL structure revision
 $ReleaseTime = strtotime('2025-06-30');

trunk/Modules/NetworkConfigAirOS/Generators/Signal.php

@@ -12 +12 @@
     // Load netwatch status from all DHCP routers
     $DbResult3 = $this->Database->query('SELECT `Id`, `LoginName`, `LoginPassword`, '.
-      '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP` '.
+      '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP`, `Name` '.
       'FROM `NetworkDevice` WHERE (`API` = 2) AND (`Used` = 1)');
     while ($Device = $DbResult3->fetch_assoc())
     {
-      echo($Device['LocalIP']."");
+      echo($Device['LocalIP'].' ('.$Device['Name']."): ");
       $SSHClient = new SSHClient($Device['LocalIP'], $Device['LoginName'], $Device['LoginPassword']);
       //$SSHClient->Debug = true;
@@ -23 +23 @@
       {
         $Array = json_decode(implode("\n", $Result), true);
-        echo('-');
         foreach ($Array as $Properties)
         {

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -16 +16 @@
     while ($Device = $DbResult3->fetch_assoc())
     {
-      echo($Device['LocalIP'].' ('.$Device['Name'].")\n");
+      echo($Device['LocalIP'].' ('.$Device['Name']."): ");
       $Routerboard = new RouterosAPI();
       //$Routerboard->SSL = true;
@@ -25 +25 @@
       $Queries = array_merge($Queries, $this->ReadWireless($Device, $Routerboard));
       $Queries = array_merge($Queries, $this->ReadWireless60G($Device, $Routerboard));
+      echo("\n");
     }
     $this->Database->Transaction($Queries);
@@ -33 +34 @@
   {
     $Queries = array();
-      
+
     $Routerboard->Write('/interface/wireless/registration-table/getall', false);
     $Routerboard->Write('=.proplist=signal-strength,tx-signal-strength,mac-address,rx-rate,tx-rate', false);
@@ -84 +85 @@
         '('.$MacRef.', '.$Strength.', '.$RemoteSignal.', '.$RateRx.', '.$RateTx.', "'.
         TimeToMysqlDateTime($this->Time).'", '.$Interface.', '.$Device['Id'].')';
+      echo('.');
     }
     return $Queries;
@@ -129 +131 @@
       $Queries[] = 'INSERT INTO `NetworkSignal` (`MAC`, `Value`, `Remote`, `RateRx`, `RateTx`, `Time`, `Interface`, `Device`) VALUES '.
         '('.$MacRef.', '.$Strength.', 0, 0, '.round($RateTx / 1000000).', "'.
-        TimeToMysqlDateTime($this->Time).'", '.$Interface.', '.$Device['Id'].')';              
+        TimeToMysqlDateTime($this->Time).'", '.$Interface.', '.$Device['Id'].')';
+      echo('.');
     }
     return $Queries;