|
@@ -185,25 +185,17 @@ if ($result < 0) {
|
|
|
exit(-1);
|
|
|
}
|
|
|
|
|
|
-$qualifiedjobs = array();
|
|
|
-foreach ($object->lines as $val) {
|
|
|
- if (!verifCond($val->test)) {
|
|
|
- continue;
|
|
|
- }
|
|
|
- $qualifiedjobs[] = $val;
|
|
|
-}
|
|
|
-
|
|
|
// TODO Duplicate code. This sequence of code must be shared with code into public/cron/cron_run_jobs.php php page.
|
|
|
|
|
|
-$nbofjobs = count($qualifiedjobs);
|
|
|
+$nbofjobs = count($object->lines);
|
|
|
$nbofjobslaunchedok = 0;
|
|
|
$nbofjobslaunchedko = 0;
|
|
|
|
|
|
-if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
|
|
|
+if (is_array($object->lines) && (count($object->lines) > 0)) {
|
|
|
$savconf = dol_clone($conf);
|
|
|
|
|
|
// Loop over job
|
|
|
- foreach ($qualifiedjobs as $line) {
|
|
|
+ foreach ($object->lines as $line) {
|
|
|
dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
|
|
|
echo "cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label;
|
|
|
|
|
@@ -245,6 +237,10 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (!verifCond($line->test)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
|
|
|
if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now)) {
|
|
|
echo " - qualified";
|