[ADDED] Force run even if cron is active with -f

omagian · Feb 16, 2014 · 6f5d866 · 6f5d866
1 parent 71162d0
commit 6f5d866
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cronjobs/shared.inc.php b/cronjobs/shared.inc.php
@@ -63,6 +63,7 @@ function cfip() { return (@defined('SECURITY')) ? 1 : 0; }
   switch ($option) {
   case '-f':
     $monitoring->setStatus($cron_name . "_disabled", "yesno", 0);
+    $monitoring->setStatus($cron_name . "_active", "yesno", 0);
     break;
   }
 }

diff --git a/public/include/classes/monitoring.class.php b/public/include/classes/monitoring.class.php
@@ -100,7 +100,7 @@ public function setStatus($name, $type, $value) {
   public function startCronjob($cron_name) {
     $aStatus = $this->getStatus($cron_name . '_active');
     if ($aStatus['value'] == 1) {
-      $this->setErrorMessage('Cron is already active in database: ' . $cron_name . '_active is 1');
+      $this->setErrorMessage('Cron is already active in database: ' . $cron_name . '_active is 1, please force run with -f once ensured it\' not running');
       return false;
     }
     $this->setStatus($cron_name . "_active", "yesno", 1);