#1.13.5 Improved crontab, prevent tasks overlapping if the task runs for longer than cron interval

Author: damanic

classes/core_cron.php

@@ -1,11 +1,11 @@
 <?php
 class Core_Cron{
 
-	public static function update_interval($code)
+	public static function update_interval($code, $now=null)
 	{
 		$bind = array(
 			'record_code' => $code,
-			'now' => Phpr_DateTime::now()->toSqlDateTime()
+			'now' => $now ? $now : Phpr_DateTime::now()->toSqlDateTime()
 		);
 		Db_DbHelper::query('insert into core_cron_table (record_code, updated_at) values (:record_code, :now) on duplicate key update updated_at =:now', $bind);
 	}
@@ -53,7 +53,7 @@ public static function queue_job($handler_name, $param_data=array())
 		Db_DbHelper::query('insert into core_cron_jobs (handler_name, param_data, created_at) values (:handler_name, :param_data, :now)', $bind);
 	}
 
-	private static function execute_cronjobs()
+	public static function execute_cronjobs()
 	{
 		// Worker can perform only 5 jobs per run
 		//
@@ -79,7 +79,7 @@ private static function execute_cronjobs()
 		}
 	}
 
-	private static function execute_crontabs()
+	public static function execute_crontabs()
 	{
 
 		$modules = Core_ModuleManager::listModules();
@@ -101,19 +101,23 @@ private static function execute_crontabs()
 					continue;
 
 
+				$now = Phpr_DateTime::now();
 				$last_exec = Phpr_DateTime::parse(self::get_interval($code), Phpr_DateTime::universalDateTimeFormat);
 				$next_exec = $last_exec->addMinutes($options['interval']);
-				$can_execute = Phpr_DateTime::now()->compare($next_exec);
+				$can_execute = $now->compare($next_exec);
 
 				if ($can_execute == -1)
 					continue;
 
-
 				try
 				{
+					self::update_interval( $code );//set last run to now to help prevent repeat triggers on long tasks
 					$method = $options['method'];
-					if ($module->$method())
-						self::update_interval( $code );
+					if ($module->$method()){
+						self::update_interval( $code ); //time of completion
+					} else {
+						self::update_interval( $code, $last_exec ); //not run, revert to last completed time
+					}
 
 				}
 				catch (Exception $ex)

cron.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Execute cron as a standalone
+ * Execute all cron tasks as a standalone
  *
  * Example usage:
  *   /usr/local/bin/php -q /home/YOUR_USERNAME/public_html/modules/core/cron.php

updates/version.dat

@@ -465,4 +465,5 @@
 #1.13.1 Bug Fix: sql now() being compared to localised PHP datetime causing cron timing issues.
 #1.13.2|@1_13_2_framework_update Security fix
 #1.13.3|@1_13_3_framework_update Evocode Security Patch. Must read http://evocode.com/blog/lemonstand-v1-vulnerability/
-#1.13.4 Bug Fix: CURLOPT_HTTPHEADER set with underscores caused issue on some stacks
+#1.13.4 Bug Fix: CURLOPT_HTTPHEADER set with underscores caused issue on some stacks
+#1.13.5 Improved crontab, prevent tasks overlapping if the task runs for longer than cron interval