Merge pull request #6 from php-api-clients/configurable-messages

Configurable log messages

Author: WyriHaximus

composer.json

@@ -11,7 +11,8 @@
   "require": {
     "php": "^7.2",
     "api-clients/middleware": "^4.0",
-    "psr/log": "^1.0"
+    "psr/log": "^1.0",
+    "wyrihaximus/string-get-in": "^1.0"
   },
   "require-dev": {
     "api-clients/test-utilities": "^5.1.0",

composer.lock

@@ -12,12 +12,17 @@
 use Throwable;
 use function React\Promise\reject;
 use function React\Promise\resolve;
+use function WyriHaximus\getIn;
 
 class LoggerMiddleware implements MiddlewareInterface
 {
-    private const REQUEST  = 'request';
-    private const RESPONSE = 'response';
-    private const ERROR    = 'error';
+    private const REQUEST            = 'request';
+    private const RESPONSE           = 'response';
+    private const ERROR              = 'error';
+
+    private const MESSAGE_URL        = '[{{transaction_id}}] Requesting: {{request.uri}}';
+    private const MESSAGE_SUCCESSFUL = '[{{transaction_id}}] Request completed with {{response.status_code}}';
+    private const MESSAGE_ERROR      = '[{{transaction_id}}] {{error.message}}';
 
     /**
      * @var LoggerInterface
@@ -43,6 +48,10 @@ public function pre(
             return resolve($request);
         }
 
+        $this->context[$transactionId] = [
+            'transaction_id' => $transactionId,
+            self::REQUEST => [],
+        ];
         $this->context[$transactionId][self::REQUEST]['method'] = $request->getMethod();
         $this->context[$transactionId][self::REQUEST]['uri'] = (string)$this->stripQueryItems(
             $request->getUri(),
@@ -61,7 +70,10 @@ public function pre(
             return resolve($request);
         }
 
-        $message = 'Requesting: ' . $this->context[$transactionId][self::REQUEST]['uri'];
+        $message = $this->renderTemplate(
+            $options[self::class][Options::MESSAGE_PRE] ?? self::MESSAGE_URL,
+            $this->context[$transactionId]
+        );
         $this->logger->log($options[self::class][Options::URL_LEVEL], $message, $this->context[$transactionId]);
 
         return resolve($request);
@@ -88,10 +100,11 @@ public function post(
             return resolve($response);
         }
 
-        $message = 'Request ' . $transactionId . ' completed.';
-
         $context = $this->addResponseToContext($context, $response, $options);
-
+        $message = $this->renderTemplate(
+            $options[self::class][Options::MESSAGE_POST] ?? self::MESSAGE_SUCCESSFUL,
+            $context
+        );
         $this->logger->log($options[self::class][Options::LEVEL], $message, $context);
 
         return resolve($response);
@@ -116,8 +129,6 @@ public function error(
             return reject($throwable);
         }
 
-        $message = $throwable->getMessage();
-
         $response = null;
         if (method_exists($throwable, 'getResponse')) {
             $response = $throwable->getResponse();
@@ -126,6 +137,7 @@ public function error(
             $context = $this->addResponseToContext($context, $response, $options);
         }
 
+        $context[self::ERROR]['message']  = $throwable->getMessage();
         $context[self::ERROR]['code']  = $throwable->getCode();
         $context[self::ERROR]['file']  = $throwable->getFile();
         $context[self::ERROR]['line']  = $throwable->getLine();
@@ -135,6 +147,10 @@ public function error(
             $context[self::ERROR]['context'] = $throwable->getContext();
         }
 
+        $message = $this->renderTemplate(
+            $options[self::class][Options::MESSAGE_ERROR] ?? self::MESSAGE_ERROR,
+            $context
+        );
         $this->logger->log($options[self::class][Options::ERROR_LEVEL], $message, $context);
 
         return reject($throwable);
@@ -185,4 +201,16 @@ private function stripQueryItems(UriInterface $uri, array $options): UriInterfac
 
         return $uri->withQuery(http_build_query($query));
     }
+
+    private function renderTemplate(string $template, array $context): string
+    {
+        $keyValues = [];
+        preg_match_all("|\{\{(.*)\}\}|U", $template, $out, PREG_PATTERN_ORDER);
+        foreach (array_unique(array_values($out[1])) as $placeHolder) {
+            $keyValues['{{' . $placeHolder . '}}'] = getIn($context, $placeHolder, '');
+        }
+        $template = str_replace(array_keys($keyValues), array_values($keyValues), $template);
+
+        return $template;
+    }
 }

src/LoggerMiddleware.php

@@ -9,4 +9,7 @@ final class Options
     public const LEVEL                  = 'level';
     public const ERROR_LEVEL            = 'error_level';
     public const URL_LEVEL              = 'url_level';
+    public const MESSAGE_PRE            = 'message_pre';
+    public const MESSAGE_POST           = 'message_post';
+    public const MESSAGE_ERROR          = 'message_error';
 }