Changeset 817 for trunk/Modules/NetworkConfig

Timestamp:

Mar 16, 2016, 8:51:59 PM (9 years ago)

Author:

chronos

Message:

• Modified: NetworkConfig now register OnChange handler to NetworkDevice and NetworkInterface so network configuration can be propagated if network device or interface was changed.

Location:

trunk/Modules/NetworkConfig

Files:

• Generate.php (modified) (2 diffs)
• NetworkConfig.php (modified) (1 diff)

trunk/Modules/NetworkConfig/Generate.php

@@ -13 +13 @@
   if($Service['UNIX_TIMESTAMP(LastTime)'] < (time() - $Service['Period']))
   {
-    $System->Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Changed' => 2));
+    $System->Database->update('NetworkConfiguration', '`Id`='.$Service['Id'], array('Changed' => 2));
     $ExecutionStart = time();
     //echo($Service['Caption'].'...');
@@ -27 +27 @@
     //echo("Done\n");
     $ExecutionTime = time() - $ExecutionStart;
-    $System->Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Changed' => 0, 'LastTime' => 'NOW()', 'ExecutionTime' => $ExecutionTime));
-    $System->Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Log' => implode("\n", $Output)));
+    $System->Database->update('NetworkConfiguration', '`Id`='.$Service['Id'], array('Changed' => 0, 'LastTime' => 'NOW()', 'ExecutionTime' => $ExecutionTime));
+    $System->Database->update('NetworkConfiguration', '`Id`='.$Service['Id'], array('Log' => implode("\n", $Output)));
   }
 }

trunk/Modules/NetworkConfig/NetworkConfig.php

@@ -51 +51 @@
       ),
     ));
+    $this->System->FormManager->RegisterFormType('TNetworkConfigurationState', array(
+      'Type' => 'Enumeration',
+      'States' => array('Neplánováno', 'V plánu', 'Provádí se'),
+    ));
+    
     $this->System->RegisterCommandLine('config', array($this, 'Config'));
+    $this->System->Models['NetworkDevice']->RegisterOnChange('NetworkConfig', array($this, 'DoNetworkChange'));
+    $this->System->Models['NetworkInterface']->RegisterOnChange('NetworkConfig', array($this, 'DoNetworkChange'));
+  }
+  
+  function DoNetworkChange()
+  {
+    $this->Database->query('UPDATE `NetworkConfiguration` SET `Changed`=1 WHERE '.
+      '(`Id`=1) OR (`Id`=7) OR (`Id`=8) OR (`Id`=9) OR (`Id`=10) OR (`Id`=11) OR (`Id`=12) OR (`Id`=13)');
   }