Changeset 759

Timestamp:

Oct 26, 2015, 11:50:43 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Scheduler task can get to state where it was not scheduled after defined period.
• Added: Log scheduler task last duration.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Scheduler/Scheduler.php (modified) (5 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 758; // Subversion revision
-$DatabaseRevision = 755; // SQL structure revision
+$Revision = 759; // Subversion revision
+$DatabaseRevision = 759; // SQL structure revision
 $ReleaseTime = strtotime('2015-10-26');

trunk/Common/Setup/Updates.php

@@ -1577 +1577 @@
   ADD CONSTRAINT `FinanceInvoiceStorno_ibfk_2` FOREIGN KEY (`StornoOf`) REFERENCES `FinanceInvoice` (`Id`);
   ");
+}
+
+function UpdateTo759($Manager)
+{
+  $Manager->Execute('ALTER TABLE `Scheduler` ADD `Duration` INT NOT NULL AFTER `Period`;');
 }
 
@@ -1653 +1658 @@
       748 => array('Revision' => 752, 'Function' => 'UpdateTo752'),
       752 => array('Revision' => 755, 'Function' => 'UpdateTo755'),
+      755 => array('Revision' => 759, 'Function' => 'UpdateTo759'),
     ));
   }

trunk/Modules/Scheduler/Scheduler.php

@@ -28 +28 @@
         'Log' => array('Type' => 'Text', 'Caption' => 'Poslední záznam', 'Default' => '', 'ReadOnly' => true),
         'LastExecutedTime' => array('Type' => 'DateTime', 'Caption' => 'Čas posledního spuštění', 'Default' => '', 'ReadOnly' => true),
+        'Duration' => array('Type' => 'TimeDiff', 'Caption' => 'Trvání', 'Default' => '', 'ReadOnly' => true),
       ),
     ));
@@ -64 +65 @@
       $DbResult = $this->Database->query('SELECT `Scheduler`.*, `SchedulerAction`.`Class` AS `Class` FROM `Scheduler` '.
         'LEFT JOIN `SchedulerAction` ON `SchedulerAction`.`Id` = `Scheduler`.`Action` '.
-        'WHERE (`Scheduler`.`Enabled`=1) AND (((`Scheduler`.`ScheduledTime` < "'.TimeToMysqlDateTime(time()).'") AND '.
-        ' (`Scheduler`.`LastExecutedTime` < `Scheduler`.`ScheduledTime`)) OR '.
+        'WHERE (`Scheduler`.`Enabled`=1) AND ( '.
+        '(`Scheduler`.`ScheduledTime` < "'.TimeToMysqlDateTime(time()).'") OR '.
         '(`Scheduler`.`ScheduledTime` IS NULL))');
       while($DbRow = $DbResult->fetch_assoc())
@@ -71 +72 @@
         echo('Executing '.$DbRow['Name']."\n");
         $Output = '';
+        $StartTime = time();
         if(class_exists($DbRow['Class']))
         {
@@ -77 +79 @@
           echo($Output);
         } else echo('Class '.$DbRow['Class'].' not found'."\n");
+        $StopTime = time();
+        $Duration = $StopTime - $StartTime;
         $this->Database->update('Scheduler', 'Id='.$DbRow['Id'],
-          array('Log' => $Output, 'LastExecutedTime' => 'NOW()'));
-        if($DbRow['ScheduledTime'] == '') $NewScheduledTime = time() + $DbRow['Period'];
-          else $NewScheduledTime = MysqlDateTimeToTime($DbRow['ScheduledTime']) + $DbRow['Period'];
-        if($DbRow['Period'] != '') $this->Database->update('Scheduler', 'Id='.$DbRow['Id'],
-          array('ScheduledTime' => TimeToMysqlDateTime($NewScheduledTime)));
+          array('Log' => $Output, 'LastExecutedTime' => TimeToMysqlDateTime($StartTime)));
+        if($DbRow['Period'] != '') {
+          if($DbRow['ScheduledTime'] == '') $NewScheduledTime = $StartTime + $DbRow['Period'];
+            else $NewScheduledTime = MysqlDateTimeToTime($DbRow['ScheduledTime']) + $DbRow['Period'];
+          if($NewScheduledTime < $StopTime) $NewScheduledTime = $StopTime + $DbRow['Period'];
+          $this->Database->update('Scheduler', 'Id='.$DbRow['Id'],
+            array('ScheduledTime' => TimeToMysqlDateTime($NewScheduledTime)));
+        }
       }
       echo('.');
@@ -96 +103 @@
   }
 }
+
+
+class ScheduleTaskTest extends SchedulerTask
+{
+  function Execute()
+  {
+    $Output = '#';
+    return($Output);
+  }
+}