Merge pull request #85 from marcin-magemojo/fixes

Fixes
magemojo · Feb 3, 2020 · eb0916c · eb0916c
2 parents 5145da3 + 01ed9d9
commit eb0916c
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Model/Schedule.php b/Model/Schedule.php
@@ -19,7 +19,6 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
     private $resource;
     private $maintenance;
     private $basedir;
-    private $consumers;
     private $consumerConfig;
     private $deploymentConfig;
     private $mqConnectionTypeResolver;
@@ -35,14 +34,16 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
      * @param ResourceModel\Schedule $resource
      * @param \Magento\Framework\App\MaintenanceMode $maintenance
      * @param \Magento\Framework\Filesystem\Driver\File $file
+     * @param \Magento\Framework\MessageQueue\Consumer\ConfigInterface $consumerConfig
+     * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
+     * @param ConnectionTypeResolver|null $mqConnectionTypeResolver
      */
     public function __construct(
         \Magento\Cron\Model\Config $cronconfig,
         directoryList $directoryList,
         \MageMojo\Cron\Model\ResourceModel\Schedule $resource,
         \Magento\Framework\App\MaintenanceMode $maintenance,
         \Magento\Framework\Filesystem\Driver\File $file,
-        \Magento\MessageQueue\Model\Cron\ConsumersRunner $consumers,
         \Magento\Framework\MessageQueue\Consumer\ConfigInterface $consumerConfig,
         \Magento\Framework\App\DeploymentConfig $deploymentConfig,
         ConnectionTypeResolver $mqConnectionTypeResolver = null
@@ -52,7 +53,6 @@ public function __construct(
         $this->resource = $resource;
         $this->maintenance = $maintenance;
         $this->file = $file;
-        $this->consumers = $consumers;
         $this->consumerConfig = $consumerConfig;
         $this->deploymentConfig = $deploymentConfig;
         $this->mqConnectionTypeResolver = $mqConnectionTypeResolver
@@ -545,7 +545,10 @@ public function executeImmediate($jobname) {
       $scheduled = $this->resource->saveSchedule($jobconfig, time(), $schedule);
 
       $state = ObjectManager::getInstance()->get("Magento\Framework\App\State");
-      $state->setAreaCode("crontab");
+      try {
+          $state->setAreaCode("crontab");
+      } catch (\Exception $e) {
+      }
       $areaList = ObjectManager::getInstance()->get(AreaList::class);
       $areaList->getArea(Area::AREA_CRONTAB)->load(Area::PART_TRANSLATE);
 
@@ -557,7 +560,7 @@ public function executeImmediate($jobname) {
         $instance->{$jobconfig["method"]}($schedule);
         $this->resource->setJobStatus($scheduled[0]["schedule_id"],'success',NULL);
       } catch (Exception $e) {
-        $this->resource->setJobStatus($job["schedule_id"],'error',$e->message);
+        $this->resource->setJobStatus($scheduled[0]["schedule_id"],'error',$e->getMessage());
       }
     }