8000 Removes \n or space when $context/$extra are empty by kirkmadera · Pull Request #24759 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Removes \n or space when $context/$extra are empty #24759

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

Closed
wants to merge 2 commits into from
Closed

Removes \n or space when $context/$extra are empty #24759

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c9f588
Removes \n or space when $context/$extra are empty
kirkmadera Oct 30, 2017
acaac15
Fixed syntax error
kirkmadera Oct 30, 2017
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
Next Next commit
Removes \n or space when $context/$extra are empty 
Simple log messages cause extra spaces or newlines when using the default format and $context or $extra are empty, resulting in output like this:

```
23:24:41 DEBUG     [test] debug


23:24:41 INFO      [test] info


23:24:41 NOTICE    [test] notice


23:24:41 WARNING   [test] warning


23:24:41 ERROR     [test] error


```

This makes reviewing command history difficult. 

In the instance where $context or $extra is empty, it should not get appended with a space or newline.

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
  • Loading branch information
@kirkmadera
kirkmadera authored Oct 30, 2017
commit 7c9f588354fc5633e072fb53d5a4f177a6e73de9
16 changes: 12 additions & 4 deletions src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,20 @@ public function format(array $record)
$levelColor = self::$levelColorMap[$record['level']];

if ($this->options['multiline']) {
$context = $extra = "\n";
$separator = "\n";
} else {
$context = $extra = ' ';
$separator = ' ';
}
$context .= $this->dumpData($record['context']);
$extra .= $this->dumpData($record['extra']);

$context = $this->dumpData($record['context']);
if ($context) {
$context = $separator.$context;
}

$extra = $this->dumpData($record['extra']);
if ($extra) {
$extra = $separator.$extra;
} }

$formatted = strtr($this->options['format'], array(
'%datetime%' => $record['datetime']->format($this->options['date_format']),
Expand Down
0