[HttpKernel] Fix error logger when stderr is redirected to /dev/null (FPM)

fabpot · fabpot · commit 5f829bdaeb0f · 2020-05-18T17:28:46.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php
@@ -37,10 +37,10 @@ class Logger extends AbstractLogger
     private $formatter;
     private $handle;
 
-    public function __construct($minLevel = null, $output = 'php://stderr', callable $formatter = null)
+    public function __construct($minLevel = null, $output = null, callable $formatter = null)
     {
         if (null === $minLevel) {
-            $minLevel = 'php://stdout' === $output || 'php://stderr' === $output ? LogLevel::CRITICAL : LogLevel::WARNING;
+            $minLevel = null === $output || 'php://stdout' === $output || 'php://stderr' === $output ? LogLevel::ERROR : LogLevel::WARNING;
 
             if (isset($_ENV['SHELL_VERBOSITY']) || isset($_SERVER['SHELL_VERBOSITY'])) {
                 switch ((int) (isset($_ENV['SHELL_VERBOSITY']) ? $_ENV['SHELL_VERBOSITY'] : $_SERVER['SHELL_VERBOSITY'])) {
@@ -58,7 +58,7 @@ public function __construct($minLevel = null, $output = 'php://stderr', callable
 
         $this->minLevelIndex = self::$levels[$minLevel];
         $this->formatter = $formatter ?: [$this, 'format'];
-        if (false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {
+        if ($output && false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {
             throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));
         }
     }
@@ -77,7 +77,11 @@ public function log($level, $message, array $context = [])
         }
 
         $formatter = $this->formatter;
-        @fwrite($this->handle, $formatter($level, $message, $context));
+        if ($this->handle) {
+            @fwrite($this->handle, $formatter($level, $message, $context));
+        } else {
+            error_log($formatter($level, $message, $context, false));
+        }
     }
 
     /**
@@ -86,7 +90,7 @@ public function log($level, $message, array $context = [])
      *
      * @return string
      */
-    private function format($level, $message, array $context)
+    private function format($level, $message, array $context, $prefixDate = true)
     {
         if (false !== strpos($message, '{')) {
             $replacements = [];
@@ -105,6 +109,11 @@ private function format($level, $message, array $context)
             $message = strtr($message, $replacements);
         }
 
-        return sprintf('%s [%s] %s', date(\DateTime::RFC3339), $level, $message).PHP_EOL;
+        $log = sprintf('[%s] %s', $level, $message).PHP_EOL;
+        if ($prefixDate) {
+            $log = date(\DateTime::RFC3339).' '.$log;
+        }
+
+        return $log;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ class Logger extends AbstractLogger`
`37`	`37`	`private $formatter;`
`38`	`38`	`private $handle;`
`39`	`39`
`40`		`- public function __construct($minLevel = null, $output = 'php://stderr', callable $formatter = null)`
	`40`	`+ public function __construct($minLevel = null, $output = null, callable $formatter = null)`
`41`	`41`	`{`
`42`	`42`	`if (null === $minLevel) {`
`43`		`- $minLevel = 'php://stdout' === $output \|\| 'php://stderr' === $output ? LogLevel::CRITICAL : LogLevel::WARNING;`
	`43`	`+ $minLevel = null === $output \|\| 'php://stdout' === $output \|\| 'php://stderr' === $output ? LogLevel::ERROR : LogLevel::WARNING;`
`44`	`44`
`45`	`45`	`if (isset($_ENV['SHELL_VERBOSITY']) \|\| isset($_SERVER['SHELL_VERBOSITY'])) {`
`46`	`46`	`switch ((int) (isset($_ENV['SHELL_VERBOSITY']) ? $_ENV['SHELL_VERBOSITY'] : $_SERVER['SHELL_VERBOSITY'])) {`
`@@ -58,7 +58,7 @@ public function __construct($minLevel = null, $output = 'php://stderr', callable`
`58`	`58`
`59`	`59`	`$this->minLevelIndex = self::$levels[$minLevel];`
`60`	`60`	`$this->formatter = $formatter ?: [$this, 'format'];`
`61`		`- if (false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {`
	`61`	`+ if ($output && false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {`
`62`	`62`	`throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));`
`63`	`63`	`}`
`64`	`64`	`}`
`@@ -77,7 +77,11 @@ public function log($level, $message, array $context = [])`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`$formatter = $this->formatter;`
`80`		`- @fwrite($this->handle, $formatter($level, $message, $context));`
	`80`	`+ if ($this->handle) {`
	`81`	`+ @fwrite($this->handle, $formatter($level, $message, $context));`
	`82`	`+ } else {`
	`83`	`+ error_log($formatter($level, $message, $context, false));`
	`84`	`+ }`
`81`	`85`	`}`
`82`	`86`
`83`	`87`	`/**`
`@@ -86,7 +90,7 @@ public function log($level, $message, array $context = [])`
`86`	`90`	`*`
`87`	`91`	`* @return string`
`88`	`92`	`*/`
`89`		`- private function format($level, $message, array $context)`
	`93`	`+ private function format($level, $message, array $context, $prefixDate = true)`
`90`	`94`	`{`
`91`	`95`	`if (false !== strpos($message, '{')) {`
`92`	`96`	`$replacements = [];`
`@@ -105,6 +109,11 @@ private function format($level, $message, array $context)`
`105`	`109`	`$message = strtr($message, $replacements);`
`106`	`110`	`}`
`107`	`111`
`108`		`- return sprintf('%s [%s] %s', date(\DateTime::RFC3339), $level, $message).PHP_EOL;`
	`112`	`+ $log = sprintf('[%s] %s', $level, $message).PHP_EOL;`
	`113`	`+ if ($prefixDate) {`
	`114`	`+ $log = date(\DateTime::RFC3339).' '.$log;`
	`115`	`+ }`
	`116`	`+`
	`117`	`+ return $log;`
`109`	`118`	`}`
`110`	`119`	`}`