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

…- unhelpful error message #3189 - static test failures
magento · May 20, 2016 · ddd6aa8 · ddd6aa8
1 parent ad96d04
commit ddd6aa8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/lib/internal/Magento/Framework/Code/GeneratedFiles.php b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
@@ -81,7 +81,8 @@ public function regenerate()
     /**
      * Read Cache types from env.php and write to a json file.
      *
-     * @param $envPath
+     * @param string $envPath
+     * @return void
      */
     private function saveCacheStatus($envPath)
     {
@@ -93,9 +94,9 @@ private function saveCacheStatus($envPath)
                 return $value;
             });
             if (!empty($enabledCacheTypes)) {
-                $this->write->writeFile($this->write->getRelativePath(
-                        $this->directoryList->getPath(DirectoryList::VAR_DIR)
-                    ) . '/.cachestates.json',
+                $varDir = $this->directoryList->getPath(DirectoryList::VAR_DIR);
+                $this->write->writeFile(
+                    $this->write->getRelativePath($varDir) . '/.cachestates.json',
                     json_encode($enabledCacheTypes)
                 );
                 $cacheTypes = array_keys($cacheData['cache_types']);
@@ -116,6 +117,7 @@ private function saveCacheStatus($envPath)
             }
         }
     }
+
     /**
      * Create flag for regeneration of code and di
      *

diff --git a/setup/src/Magento/Setup/Model/Cron/JobFactory.php b/setup/src/Magento/Setup/Model/Cron/JobFactory.php
@@ -54,7 +54,7 @@ public function create($name, array $params = [])
         $cronStatus = $this->serviceLocator->get('Magento\Setup\Model\Cron\Status');
         $statusStream = fopen($cronStatus->getStatusFilePath(), 'a+');
         $logStream = fopen($cronStatus->getLogFilePath(), 'a+');
-        $multipleStreamOutput = new MultipleStreamOutput([$statusStream, $logStream]);
+        $streamOutput = new MultipleStreamOutput([$statusStream, $logStream]);
         $objectManagerProvider = $this->serviceLocator->get('Magento\Setup\Model\ObjectManagerProvider');
         /** @var \Magento\Framework\ObjectManagerInterface $objectManager */
         $objectManager = $objectManagerProvider->get();
@@ -63,7 +63,7 @@ public function create($name, array $params = [])
                 return new JobUpgrade(
                     $this->serviceLocator->get('Magento\Setup\Console\Command\UpgradeCommand'),
                     $objectManagerProvider,
-                    $multipleStreamOutput,
+                    $streamOutput,
                     $this->serviceLocator->get('Magento\Setup\Model\Cron\Queue'),
                     $cronStatus,
                     $name,
@@ -73,7 +73,7 @@ public function create($name, array $params = [])
             case self::JOB_DB_ROLLBACK:
                 return new JobDbRollback(
                     $objectManager->get('Magento\Framework\Setup\BackupRollbackFactory'),
-                    $multipleStreamOutput,
+                    $streamOutput,
                     $cronStatus,
                     $objectManagerProvider,
                     $name,
@@ -83,7 +83,7 @@ public function create($name, array $params = [])
             case self::JOB_STATIC_REGENERATE:
                 return new JobStaticRegenerate(
                     $objectManagerProvider,
-                    $multipleStreamOutput,
+                    $streamOutput,
                     $cronStatus,
                     $name,
                     $params
@@ -104,7 +104,7 @@ public function create($name, array $params = [])
                     $moduleUninstall,
                     $themeUninstall,
                     $objectManagerProvider,
-                    $multipleStreamOutput,
+                    $streamOutput,
                     $this->serviceLocator->get('Magento\Setup\Model\Cron\Queue'),
                     $cronStatus,
                     $this->serviceLocator->get('Magento\Setup\Model\Updater'),
@@ -116,7 +116,7 @@ public function create($name, array $params = [])
                 return new JobModule(
                     $this->serviceLocator->get('Magento\Setup\Console\Command\ModuleEnableCommand'),
                     $objectManagerProvider,
-                    $multipleStreamOutput,
+                    $streamOutput,
                     $cronStatus,
                     $name,
                     $params
@@ -126,26 +126,19 @@ public function create($name, array $params = [])
                 return new JobModule(
                     $this->serviceLocator->get('Magento\Setup\Console\Command\ModuleDisableCommand'),
                     $objectManagerProvider,
-                    $multipleStreamOutput,
+                    $streamOutput,
                     $cronStatus,
                     $name,
                     $params
                 );
                 break;
             case self::JOB_ENABLE_CACHE:
                 $cmd = $objectManager->get('Magento\Backend\Console\Command\CacheEnableCommand');
-                return new JobSetCache(
-                    $cmd,
-                    $objectManagerProvider,
-                    $multipleStreamOutput,
-                    $cronStatus,
-                    $name,
-                    $params
-                );
+                return new JobSetCache($cmd, $objectManagerProvider, $streamOutput, $cronStatus, $name, $params);
                 break;
             case self::JOB_DISABLE_CACHE:
                 $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;
             default:
                 throw new \RuntimeException(sprintf('"%s" job is not supported.', $name));