Skip to content
Snippets Groups Projects
Commit ddd6aa84 authored by Maddy Chellathurai's avatar Maddy Chellathurai
Browse files

MAGETWO-52000: [Github][PR]impossible to see what is wrong with cron -...

MAGETWO-52000: [Github][PR]impossible to see what is wrong with cron - unhelpful error message #3189

- static test failures
parent ad96d040
Branches
Tags
No related merge requests found
...@@ -81,7 +81,8 @@ class GeneratedFiles ...@@ -81,7 +81,8 @@ class GeneratedFiles
/** /**
* Read Cache types from env.php and write to a json file. * Read Cache types from env.php and write to a json file.
* *
* @param $envPath * @param string $envPath
* @return void
*/ */
private function saveCacheStatus($envPath) private function saveCacheStatus($envPath)
{ {
...@@ -93,9 +94,9 @@ class GeneratedFiles ...@@ -93,9 +94,9 @@ class GeneratedFiles
return $value; return $value;
}); });
if (!empty($enabledCacheTypes)) { if (!empty($enabledCacheTypes)) {
$this->write->writeFile($this->write->getRelativePath( $varDir = $this->directoryList->getPath(DirectoryList::VAR_DIR);
$this->directoryList->getPath(DirectoryList::VAR_DIR) $this->write->writeFile(
) . '/.cachestates.json', $this->write->getRelativePath($varDir) . '/.cachestates.json',
json_encode($enabledCacheTypes) json_encode($enabledCacheTypes)
); );
$cacheTypes = array_keys($cacheData['cache_types']); $cacheTypes = array_keys($cacheData['cache_types']);
...@@ -116,6 +117,7 @@ class GeneratedFiles ...@@ -116,6 +117,7 @@ class GeneratedFiles
} }
} }
} }
/** /**
* Create flag for regeneration of code and di * Create flag for regeneration of code and di
* *
......
...@@ -54,7 +54,7 @@ class JobFactory ...@@ -54,7 +54,7 @@ class JobFactory
$cronStatus = $this->serviceLocator->get('Magento\Setup\Model\Cron\Status'); $cronStatus = $this->serviceLocator->get('Magento\Setup\Model\Cron\Status');
$statusStream = fopen($cronStatus->getStatusFilePath(), 'a+'); $statusStream = fopen($cronStatus->getStatusFilePath(), 'a+');
$logStream = fopen($cronStatus->getLogFilePath(), 'a+'); $logStream = fopen($cronStatus->getLogFilePath(), 'a+');
$multipleStreamOutput = new MultipleStreamOutput([$statusStream, $logStream]); $streamOutput = new MultipleStreamOutput([$statusStream, $logStream]);
$objectManagerProvider = $this->serviceLocator->get('Magento\Setup\Model\ObjectManagerProvider'); $objectManagerProvider = $this->serviceLocator->get('Magento\Setup\Model\ObjectManagerProvider');
/** @var \Magento\Framework\ObjectManagerInterface $objectManager */ /** @var \Magento\Framework\ObjectManagerInterface $objectManager */
$objectManager = $objectManagerProvider->get(); $objectManager = $objectManagerProvider->get();
...@@ -63,7 +63,7 @@ class JobFactory ...@@ -63,7 +63,7 @@ class JobFactory
return new JobUpgrade( return new JobUpgrade(
$this->serviceLocator->get('Magento\Setup\Console\Command\UpgradeCommand'), $this->serviceLocator->get('Magento\Setup\Console\Command\UpgradeCommand'),
$objectManagerProvider, $objectManagerProvider,
$multipleStreamOutput, $streamOutput,
$this->serviceLocator->get('Magento\Setup\Model\Cron\Queue'), $this->serviceLocator->get('Magento\Setup\Model\Cron\Queue'),
$cronStatus, $cronStatus,
$name, $name,
...@@ -73,7 +73,7 @@ class JobFactory ...@@ -73,7 +73,7 @@ class JobFactory
case self::JOB_DB_ROLLBACK: case self::JOB_DB_ROLLBACK:
return new JobDbRollback( return new JobDbRollback(
$objectManager->get('Magento\Framework\Setup\BackupRollbackFactory'), $objectManager->get('Magento\Framework\Setup\BackupRollbackFactory'),
$multipleStreamOutput, $streamOutput,
$cronStatus, $cronStatus,
$objectManagerProvider, $objectManagerProvider,
$name, $name,
...@@ -83,7 +83,7 @@ class JobFactory ...@@ -83,7 +83,7 @@ class JobFactory
case self::JOB_STATIC_REGENERATE: case self::JOB_STATIC_REGENERATE:
return new JobStaticRegenerate( return new JobStaticRegenerate(
$objectManagerProvider, $objectManagerProvider,
$multipleStreamOutput, $streamOutput,
$cronStatus, $cronStatus,
$name, $name,
$params $params
...@@ -104,7 +104,7 @@ class JobFactory ...@@ -104,7 +104,7 @@ class JobFactory
$moduleUninstall, $moduleUninstall,
$themeUninstall, $themeUninstall,
$objectManagerProvider, $objectManagerProvider,
$multipleStreamOutput, $streamOutput,
$this->serviceLocator->get('Magento\Setup\Model\Cron\Queue'), $this->serviceLocator->get('Magento\Setup\Model\Cron\Queue'),
$cronStatus, $cronStatus,
$this->serviceLocator->get('Magento\Setup\Model\Updater'), $this->serviceLocator->get('Magento\Setup\Model\Updater'),
...@@ -116,7 +116,7 @@ class JobFactory ...@@ -116,7 +116,7 @@ class JobFactory
return new JobModule( return new JobModule(
$this->serviceLocator->get('Magento\Setup\Console\Command\ModuleEnableCommand'), $this->serviceLocator->get('Magento\Setup\Console\Command\ModuleEnableCommand'),
$objectManagerProvider, $objectManagerProvider,
$multipleStreamOutput, $streamOutput,
$cronStatus, $cronStatus,
$name, $name,
$params $params
...@@ -126,7 +126,7 @@ class JobFactory ...@@ -126,7 +126,7 @@ class JobFactory
return new JobModule( return new JobModule(
$this->serviceLocator->get('Magento\Setup\Console\Command\ModuleDisableCommand'), $this->serviceLocator->get('Magento\Setup\Console\Command\ModuleDisableCommand'),
$objectManagerProvider, $objectManagerProvider,
$multipleStreamOutput, $streamOutput,
$cronStatus, $cronStatus,
$name, $name,
$params $params
...@@ -134,18 +134,11 @@ class JobFactory ...@@ -134,18 +134,11 @@ class JobFactory
break; break;
case self::JOB_ENABLE_CACHE: case self::JOB_ENABLE_CACHE:
$cmd = $objectManager->get('Magento\Backend\Console\Command\CacheEnableCommand'); $cmd = $objectManager->get('Magento\Backend\Console\Command\CacheEnableCommand');
return new JobSetCache( return new JobSetCache($cmd, $objectManagerProvider, $streamOutput, $cronStatus, $name, $params);
$cmd,
$objectManagerProvider,
$multipleStreamOutput,
$cronStatus,
$name,
$params
);
break; break;
case self::JOB_DISABLE_CACHE: case self::JOB_DISABLE_CACHE:
$cmd = $objectManager->get('Magento\Backend\Console\Command\CacheDisableCommand'); $cmd = $objectManager->get('Magento\Backend\Console\Command\CacheDisableCommand');
return new JobSetCache($cmd, $objectManagerProvider, $multipleStreamOutput, $cronStatus, $name); return new JobSetCache($cmd, $objectManagerProvider, $streamOutput, $cronStatus, $name);
break; break;
default: default:
throw new \RuntimeException(sprintf('"%s" job is not supported.', $name)); throw new \RuntimeException(sprintf('"%s" job is not supported.', $name));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment