Skip to content

Commit ddd6aa8

Browse files
committed
MAGETWO-52000: [Github][PR]impossible to see what is wrong with cron - unhelpful error message #3189
- static test failures
1 parent ad96d04 commit ddd6aa8

File tree

2 files changed

+15
-20
lines changed

2 files changed

+15
-20
lines changed

lib/internal/Magento/Framework/Code/GeneratedFiles.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ public function regenerate()
8181
/**
8282
* Read Cache types from env.php and write to a json file.
8383
*
84-
* @param $envPath
84+
* @param string $envPath
85+
* @return void
8586
*/
8687
private function saveCacheStatus($envPath)
8788
{
@@ -93,9 +94,9 @@ private function saveCacheStatus($envPath)
9394
return $value;
9495
});
9596
if (!empty($enabledCacheTypes)) {
96-
$this->write->writeFile($this->write->getRelativePath(
97-
$this->directoryList->getPath(DirectoryList::VAR_DIR)
98-
) . '/.cachestates.json',
97+
$varDir = $this->directoryList->getPath(DirectoryList::VAR_DIR);
98+
$this->write->writeFile(
99+
$this->write->getRelativePath($varDir) . '/.cachestates.json',
99100
json_encode($enabledCacheTypes)
100101
);
101102
$cacheTypes = array_keys($cacheData['cache_types']);
@@ -116,6 +117,7 @@ private function saveCacheStatus($envPath)
116117
}
117118
}
118119
}
120+
119121
/**
120122
* Create flag for regeneration of code and di
121123
*

setup/src/Magento/Setup/Model/Cron/JobFactory.php

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function create($name, array $params = [])
5454
$cronStatus = $this->serviceLocator->get('Magento\Setup\Model\Cron\Status');
5555
$statusStream = fopen($cronStatus->getStatusFilePath(), 'a+');
5656
$logStream = fopen($cronStatus->getLogFilePath(), 'a+');
57-
$multipleStreamOutput = new MultipleStreamOutput([$statusStream, $logStream]);
57+
$streamOutput = new MultipleStreamOutput([$statusStream, $logStream]);
5858
$objectManagerProvider = $this->serviceLocator->get('Magento\Setup\Model\ObjectManagerProvider');
5959
/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
6060
$objectManager = $objectManagerProvider->get();
@@ -63,7 +63,7 @@ public function create($name, array $params = [])
6363
return new JobUpgrade(
6464
$this->serviceLocator->get('Magento\Setup\Console\Command\UpgradeCommand'),
6565
$objectManagerProvider,
66-
$multipleStreamOutput,
66+
$streamOutput,
6767
$this->serviceLocator->get('Magento\Setup\Model\Cron\Queue'),
6868
$cronStatus,
6969
$name,
@@ -73,7 +73,7 @@ public function create($name, array $params = [])
7373
case self::JOB_DB_ROLLBACK:
7474
return new JobDbRollback(
7575
$objectManager->get('Magento\Framework\Setup\BackupRollbackFactory'),
76-
$multipleStreamOutput,
76+
$streamOutput,
7777
$cronStatus,
7878
$objectManagerProvider,
7979
$name,
@@ -83,7 +83,7 @@ public function create($name, array $params = [])
8383
case self::JOB_STATIC_REGENERATE:
8484
return new JobStaticRegenerate(
8585
$objectManagerProvider,
86-
$multipleStreamOutput,
86+
$streamOutput,
8787
$cronStatus,
8888
$name,
8989
$params
@@ -104,7 +104,7 @@ public function create($name, array $params = [])
104104
$moduleUninstall,
105105
$themeUninstall,
106106
$objectManagerProvider,
107-
$multipleStreamOutput,
107+
$streamOutput,
108108
$this->serviceLocator->get('Magento\Setup\Model\Cron\Queue'),
109109
$cronStatus,
110110
$this->serviceLocator->get('Magento\Setup\Model\Updater'),
@@ -116,7 +116,7 @@ public function create($name, array $params = [])
116116
return new JobModule(
117117
$this->serviceLocator->get('Magento\Setup\Console\Command\ModuleEnableCommand'),
118118
$objectManagerProvider,
119-
$multipleStreamOutput,
119+
$streamOutput,
120120
$cronStatus,
121121
$name,
122122
$params
@@ -126,26 +126,19 @@ public function create($name, array $params = [])
126126
return new JobModule(
127127
$this->serviceLocator->get('Magento\Setup\Console\Command\ModuleDisableCommand'),
128128
$objectManagerProvider,
129-
$multipleStreamOutput,
129+
$streamOutput,
130130
$cronStatus,
131131
$name,
132132
$params
133133
);
134134
break;
135135
case self::JOB_ENABLE_CACHE:
136136
$cmd = $objectManager->get('Magento\Backend\Console\Command\CacheEnableCommand');
137-
return new JobSetCache(
138-
$cmd,
139-
$objectManagerProvider,
140-
$multipleStreamOutput,
141-
$cronStatus,
142-
$name,
143-
$params
144-
);
137+
return new JobSetCache($cmd, $objectManagerProvider, $streamOutput, $cronStatus, $name, $params);
145138
break;
146139
case self::JOB_DISABLE_CACHE:
147140
$cmd = $objectManager->get('Magento\Backend\Console\Command\CacheDisableCommand');
148-
return new JobSetCache($cmd, $objectManagerProvider, $multipleStreamOutput, $cronStatus, $name);
141+
return new JobSetCache($cmd, $objectManagerProvider, $streamOutput, $cronStatus, $name);
149142
break;
150143
default:
151144
throw new \RuntimeException(sprintf('"%s" job is not supported.', $name));

0 commit comments

Comments
 (0)