Changeset 830

Timestamp:

Apr 30, 2016, 11:55:02 PM (9 years ago)

Author:

chronos

Message:

• Modified: Notify background job is now needed to run separately by cmd.php notify.
• Added: Catch exception thrown from scheduler jobs.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/Notify/Notify.php (modified) (4 diffs)
• Modules/Scheduler/Scheduler.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 828; // Subversion revision
+$Revision = 830; // Subversion revision
 $DatabaseRevision = 824; // SQL structure revision
-$ReleaseTime = strtotime('2016-04-27');
+$ReleaseTime = strtotime('2016-04-30');

trunk/Modules/Network/Network.php

@@ -711 +711 @@
     $this->Database->query('DELETE FROM `NetworkPort` WHERE `Interface`='.$Id);
     $this->Database->query('DELETE FROM `NetworkSignal` WHERE `Interface`='.$Id);
-    $this->Database->query('DELETE FROM `NetworkInterfaceWireless` WHERE `Interface`='.$Id);
+    $this->Database->query('DELETE FROM `NetworkInterfaceWireless` WHERE `NetworkInterface`='.$Id);
   }
 

trunk/Modules/Notify/Notify.php

@@ -6 +6 @@
 {
   var $Checks;
-  
+
   function __construct($System)
   {
@@ -38 +38 @@
       ),
     ));
+    $this->System->RegisterCommandLine('notify', array($this, 'RunCheck'));
   }
-  
+
   function RegisterCheck($Name, $Callback)
   {
-    if(array_key_exists($Name, $this->Checks)) 
+    if(array_key_exists($Name, $this->Checks))
       throw new Exception('Check function "'.$Name.'" already registered.');
     $this->Checks[$Name] = array('Callback' => $Callback);
   }
-  
+
   function UnregisterCheck($Name)
   {
-    if(!array_key_exists($Name, $this->Checks)) 
+    if(!array_key_exists($Name, $this->Checks))
       throw new Exception('Check function "'.$Name.'" not registered.');
     unset($this->Checks[$Name]);
@@ -104 +105 @@
   }
 
+  function RunCheck($Parameters)
+  {
+    RepeatFunction(30, array($this, 'Check'));
+  }
+
   function DoInstall()
   {
@@ -142 +148 @@
   }
 }
-
-class ScheduleNotifyCheck extends SchedulerTask
-{
-  function Execute()
-  {
-    $Output = $this->System->ModuleManager->Modules['Notify']->Check();
-
-    return($Output);
-  }
-}

trunk/Modules/Scheduler/Scheduler.php

@@ -76 +76 @@
         {
           $Class = new $DbRow['Class']($this->System);
-          $Output = $Class->Execute();
+          try {
+            $Output = $Class->Execute();
+          } catch (Exception $E) {
+            echo($E->getMessage()."\n");
+          }
           echo($Output);
         } else echo('Class '.$DbRow['Class'].' not found'."\n");