diff --git a/Model/Job.php b/Model/Job.php index d0fe168..5ac7734 100644 --- a/Model/Job.php +++ b/Model/Job.php @@ -159,6 +159,10 @@ public static function getNextJobFromQueue() \Reflektion\Catalogexport\Model\Job::STATUS_SCHEDULED . " not in (select status from {$table} mbj2 where mbj2.job_id = main_table.dependent_on_job_id) " ) + ->where( + \Reflektion\Catalogexport\Model\Job::STATUS_RUNNING + . " not in (select status from {$table} mbj2 where mbj2.job_id = main_table.dependent_on_job_id) " + ) ->order('job_id') ->limit(1); $dateTime = $objectManager->get("\Magento\Framework\Stdlib\DateTime\DateTime"); diff --git a/composer.json b/composer.json index f607e19..cbddd99 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Reflektion Search and Recommendation experience. http://reflektion.com/", "homepage": "https://github.com/Reflektion/reflektion_magento_2", "type": "magento2-module", - "version": "1.0.4", + "version": "1.0.5", "license": [ "https://opensource.org/licenses/osl-3.0.php" ], diff --git a/etc/cron_groups.xml b/etc/cron_groups.xml new file mode 100644 index 0000000..5901e91 --- /dev/null +++ b/etc/cron_groups.xml @@ -0,0 +1,12 @@ + + + + 1 + 60 + 120 + 60 + 300 + 600 + 1 + + \ No newline at end of file diff --git a/etc/crontab.xml b/etc/crontab.xml index 03b49c3..e1f44a3 100644 --- a/etc/crontab.xml +++ b/etc/crontab.xml @@ -1,9 +1,9 @@ - - - */1 * * * * - - + + + */1 * * * * + + \ No newline at end of file diff --git a/etc/module.xml b/etc/module.xml index 1a7f3f5..f3c1c6f 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file