From 75a3c2ab3e34e8dad0cee41f332cc938b8384e4c Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai <mchellathura@magento.com> Date: Mon, 16 May 2016 14:23:41 -0500 Subject: [PATCH] MAGETWO-52000: [Github][PR]impossible to see what is wrong with cron - unhelpful error message #3189 - fixes for QA issues. --- setup/src/Magento/Setup/Model/Cron/JobSetCache.php | 3 ++- .../src/Magento/Setup/Model/UpdaterTaskCreator.php | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/setup/src/Magento/Setup/Model/Cron/JobSetCache.php b/setup/src/Magento/Setup/Model/Cron/JobSetCache.php index 186634556fa..0ae05e140f4 100644 --- a/setup/src/Magento/Setup/Model/Cron/JobSetCache.php +++ b/setup/src/Magento/Setup/Model/Cron/JobSetCache.php @@ -54,7 +54,8 @@ class JobSetCache extends AbstractJob public function execute() { try { - $this->command->run(new ArrayInput(['command' => $this->command->getName()]), $this->output); + $this->params['command'] = $this->command->getName(); + $this->command->run(new ArrayInput($this->params), $this->output); } catch (\Exception $e) { $this->status->toggleUpdateError(true); throw new \RuntimeException(sprintf('Could not complete %s successfully: %s', $this, $e->getMessage())); diff --git a/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php b/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php index 0b673ef3327..2acebd3016d 100644 --- a/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php +++ b/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php @@ -138,12 +138,6 @@ class UpdaterTaskCreator \Magento\Setup\Model\Cron\JobFactory::JOB_UPGRADE, [] ); - } elseif ($jobType == 'disable') { - $errorMessage .= $this->updater->createUpdaterTask( - [], - \Magento\Setup\Model\Updater::TASK_TYPE_MAINTENANCE_MODE, - ['enable' => false] - ); } $enabledCaches = []; @@ -161,6 +155,14 @@ class UpdaterTaskCreator ); } + if ($jobType == 'disable') { + $errorMessage .= $this->updater->createUpdaterTask( + [], + \Magento\Setup\Model\Updater::TASK_TYPE_MAINTENANCE_MODE, + ['enable' => false] + ); + } + return $errorMessage; } -- GitLab