Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions Console/Command/WarmNodeCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ private function setAreaCode()
protected function execute(
\Symfony\Component\Console\Input\InputInterface $input,
\Symfony\Component\Console\Output\OutputInterface $output
)
{
): int {
$this->setAreaCode();

$force = $input->getOption('force');
Expand All @@ -65,6 +64,10 @@ protected function execute(
$output->writeln($message);

file_put_contents($this->nodeWarmer->getWarmupLogFilePath(), $message);

return \Magento\Framework\Console\Cli::RETURN_FAILURE;
}

return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
}
}
4 changes: 2 additions & 2 deletions Log/CapturingLoggerDecorator.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ public function flush()
* @param string $message
* @param array $context
*/
public function log($level, $message, array $context = array())
public function log($level, string|\Stringable $message, array $context = []): void
{
$this->upstreamLogger->log($level, $message, $context);
$this->buffer[] = [time(), $level, $message];
}
}
}
19 changes: 14 additions & 5 deletions Log/LogFormatter.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,26 @@

class LogFormatter implements \Monolog\Formatter\FormatterInterface
{
public function format(array $record)
public function format(array|\Monolog\LogRecord $record)
{
if (is_array($record)) {
[$timestamp, $level, $message] = $record;
return sprintf('[%s] [%s] %s',
date('Y-m-d H:i:s', $timestamp),
$level,
$message
);
}

return sprintf('[%s] [%s] %s',
date('Y-m-d H:i:s', $record[0]),
$record[1],
$record[2]
date('Y-m-d H:i:s', $record->datetime->getTimestamp()),
$record->level->getName(),
$record->message
);
}

public function formatBatch(array $records)
{
return implode("\n", array_map([$this, 'format'], $records));
}
}
}