Changeset 785

Timestamp:

Jan 9, 2016, 1:08:20 PM (9 years ago)

Author:

chronos

Message:

• Removed: Old NetworkInterfaceStat table and availability history replaced by NetworkInterfaceUpDown newer mechanizm.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Network/Availability.php (deleted)
• Modules/Network/Network.php (modified) (4 diffs)
• Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (1 diff)

trunk/Application/UpdateTrace.php

@@ -1788 +1788 @@
   ADD CONSTRAINT `VPS_ibfk_2` FOREIGN KEY (`OSTemplate`) REFERENCES `OSTemplate` (`Id`),
   ADD CONSTRAINT `VPS_ibfk_3` FOREIGN KEY (`Limits`) REFERENCES `VPSLimit` (`Id`);");
+}
+
+function UpdateTo785($Manager)
+{
+  $Manager->Execute('DROP TABLE `NetworkInterfaceStat`');
 }
 
@@ -1870 +1875 @@
       765 => array('Revision' => 768, 'Function' => 'UpdateTo768'),
       768 => array('Revision' => 770, 'Function' => 'UpdateTo770'),
+      770 => array('Revision' => 785, 'Function' => 'UpdateTo785'),
     ));
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 784; // Subversion revision
-$DatabaseRevision = 770; // SQL structure revision
+$Revision = 786; // Subversion revision
+$DatabaseRevision = 785; // SQL structure revision
 $ReleaseTime = strtotime('2016-01-09');

trunk/Modules/Network/Network.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/HostList.php');
-include_once(dirname(__FILE__).'/Availability.php');
 include_once(dirname(__FILE__).'/Subnet.php');
 include_once(dirname(__FILE__).'/Hosting.php');
@@ -92 +91 @@
   {
     $Output = '<a href="'.$this->System->Link('/network/frequency-plan/').'">Frekvenční plán</a><br />';
-    $Output .= '<a href="'.$this->System->Link('/network/availability/').'">Měření dostupnosti zařízení</a><br />';
     $Output .= '<a href="'.$this->System->Link('/network/subnet/').'">Výpis registrovaných podsítí</a><br />';
     $Output .= '<a href="'.$this->System->Link('/network/hosts/').'">Registrované zařízení</a><br />';
@@ -124 +122 @@
     $this->System->RegisterPage('network', 'PageNetwork');
     $this->System->RegisterPage(array('network', 'administration'), 'PageNetworkAdministration');
-    $this->System->RegisterPage(array('network', 'availability'), 'PageAvailability');
     $this->System->RegisterPage(array('network', 'subnet'), 'PageSubnet');
     $this->System->RegisterPage(array('network', 'user-hosts'), 'PageNetworkHostList');
@@ -167 +164 @@
         'LoginPassword' => array('Type' => 'String', 'Caption' => 'Přihlašovací heslo', 'Default' => '', 'Null' => true, 'NotInList' => true),
         'API' => array('Type' => 'TDeviceAPIType', 'Caption' => 'API', 'Default' => '', 'Null' => true),
-      ),
-      'Actions' => array(
-        array('Caption' => 'Dostupnost zařízení', 'URL' => '/network/availability/'),
       ),
     ));

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -87 +87 @@
       }
       $DbResult = $this->Database->update('NetworkDevice', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));
-
-      // Update interface online statistics
-      $DbResult = $this->Database->select('NetworkInterface', 'Id', '`Online` = 1');
-      while($Interface = $DbResult->fetch_assoc())
-      {
-        $DbResult2 = $this->Database->select('NetworkInterfaceStat', '*', '(`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
-        if($DbResult2->num_rows == 0) $System->Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`, `PingCount`) VALUES ("'.$Interface['Id'].'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"), 1)');
-        else $this->Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
-      }
   }