Skip to content

Forwardport of PR-13709: Changes static content deploy log levels ver… #13975

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

Merged
merged 1 commit into from
Mar 10, 2018
Merged

Forwardport of PR-13709: Changes static content deploy log levels ver… #13975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/code/Magento/Deploy/Console/ConsoleLogger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ class ConsoleLogger extends AbstractLogger
LogLevel::CRITICAL => OutputInterface::VERBOSITY_NORMAL,
LogLevel::ERROR => OutputInterface::VERBOSITY_NORMAL,
LogLevel::WARNING => OutputInterface::VERBOSITY_NORMAL,
LogLevel::NOTICE => OutputInterface::VERBOSITY_VERBOSE,
LogLevel::INFO => OutputInterface::VERBOSITY_VERY_VERBOSE,
LogLevel::NOTICE => OutputInterface::VERBOSITY_NORMAL,
LogLevel::INFO => OutputInterface::VERBOSITY_VERBOSE,
LogLevel::DEBUG => OutputInterface::VERBOSITY_DEBUG
];

Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Deploy/Process/Queue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public function process()
foreach ($packages as $name => $packageJob) {
$this->assertAndExecute($name, $packages, $packageJob);
}
$this->logger->notice('.');
$this->logger->info('.');
sleep(3);
foreach ($this->inProgress as $name => $package) {
if ($this->isDeployed($package)) {
Expand Down Expand Up @@ -214,7 +214,7 @@ private function awaitForAllProcesses()
unset($this->inProgress[$name]);
}
}
$this->logger->notice('.');
$this->logger->info('.');
sleep(5);
}
if ($this->isCanBeParalleled()) {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Deploy/Service/DeployPackage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ private function register(Package $package, PackageFile $file = null, $skipLoggi
$this->deployStaticFile->writeTmpFile('info.json', $package->getPath(), json_encode($info));

if (!$skipLogging) {
$this->logger->notice($logMessage);
$this->logger->info($logMessage);
}
}
}
4 changes: 2 additions & 2 deletions setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ protected function execute(InputInterface $input, OutputInterface $output)

$logger = $this->consoleLoggerFactory->getLogger($output, $verbose);
if (!$refreshOnly) {
$logger->alert(PHP_EOL . "Deploy using {$options[Options::STRATEGY]} strategy");
$logger->notice(PHP_EOL . "Deploy using {$options[Options::STRATEGY]} strategy");
}

$this->mockCache();
Expand All @@ -140,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$deployService->deploy($options);

if (!$refreshOnly) {
$logger->alert(PHP_EOL . "Execution time: " . (microtime(true) - $time));
$logger->notice(PHP_EOL . "Execution time: " . (microtime(true) - $time));
}

return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
Expand Down
2 changes: 1 addition & 1 deletion setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function testExecute($input)

$this->consoleLoggerFactory->expects($this->once())
->method('getLogger')->willReturn($this->logger);
$this->logger->expects($this->exactly(2))->method('alert');
$this->logger->expects($this->exactly(2))->method('notice');

$this->objectManager->expects($this->once())->method('create')->willReturn($this->deployService);
$this->deployService->expects($this->once())->method('deploy');
Expand Down