Merge pull request #68 from neighborhoods/feature/KOJO-99

Add a log format option to pretty print JSON
neighborhoods · May 6, 2019 · 4d04304 · 4d04304
2 parents 9ba59ed + e1714dd
commit 4d04304
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Process/Pool/Logger.php b/src/Process/Pool/Logger.php
@@ -57,7 +57,6 @@ public function log($level, $message, array $context = [])
 
                 if (array_key_exists(self::CONTEXT_KEY_EXCEPTION, $context) && $context[self::CONTEXT_KEY_EXCEPTION]
                 instanceof \Throwable){
-                    $context[self::CONTEXT_KEY_EXCEPTION_STRING] = (string)$context[self::CONTEXT_KEY_EXCEPTION];
                     $normalizedException = (new NormalizerFormatter())->format([$context[self::CONTEXT_KEY_EXCEPTION]]);
                     unset($context[self::CONTEXT_KEY_EXCEPTION]);
                     $context[self::CONTEXT_KEY_EXCEPTION] = $normalizedException[0];

diff --git a/src/Process/Pool/Logger/Formatter.php b/src/Process/Pool/Logger/Formatter.php
@@ -17,11 +17,14 @@ class Formatter implements FormatterInterface
 
     const LOG_FORMAT_PIPES = 'pipes';
     const LOG_FORMAT_JSON = 'json';
+    const LOG_FORMAT_JSON_PRETTY_PRINT = 'json_pretty_print';
 
     public function getFormattedMessage(MessageInterface $message) : string
     {
         if ($this->hasLogFormat() && $this->getLogFormat() === self::LOG_FORMAT_PIPES) {
             return $this->formatPipes($message);
+        } elseif ($this->hasLogFormat() && $this->getLogFormat() === self::LOG_FORMAT_JSON_PRETTY_PRINT) {
+            return $this->formatJsonPrettyPrint($message);
         } else {
             return $this->formatJson($message);
         }
@@ -58,6 +61,11 @@ protected function formatJson(MessageInterface $message) : string
         return json_encode($message);
     }
 
+    protected function formatJsonPrettyPrint(MessageInterface $message) : string
+    {
+        return json_encode($message, JSON_PRETTY_PRINT);
+    }
+
     public function setProcessPathPadding(int $processPathPadding) : FormatterInterface
     {
         $this->_create(self::PROP_PROCESS_PATH_PADDING, $processPathPadding);