Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #85

Merged
merged 3 commits into from
Feb 3, 2020
Merged

Fixes #85

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
342df6a
Fix exception handling
marcinbojanowski Feb 1, 2020
d9e86b6
Remove M2 Commerce Edition dependency
marcinbojanowski Feb 1, 2020
01ed9d9
Add exception handling for setAreaCode call
marcinbojanowski Feb 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions Model/Schedule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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);

Expand All @@ -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());
}
}

Expand Down