Merge pull request #1 from shadowhand/fix/better-logger

Improve logger forwarding

Author: shadowhand

src/Writer/LoggerWriter.php

@@ -6,6 +6,9 @@
 
 use Knotlog\Log;
 use Psr\Log\LoggerInterface;
+use Stringable;
+
+use function is_string;
 
 final readonly class LoggerWriter implements LogWriter
 {
@@ -21,9 +24,37 @@ public function write(Log $log): void
         $context = $log->all();
 
         if ($log->hasError()) {
-            $this->logger->error('{' . $this->errorKey . '}', $context);
+            $this->logger->error($this->getError($context), $context);
         } else {
-            $this->logger->info('{' . $this->messageKey . '}', $context);
+            $this->logger->info($this->getInfo($context), $context);
         }
     }
+
+    /**
+     * @param array<string, mixed> $context
+     */
+    private function getError(array $context): string|Stringable
+    {
+        $message = $context[$this->errorKey] ?? null;
+
+        if (is_string($message) || $message instanceof Stringable) {
+            return $message;
+        }
+
+        return 'Knotlog error';
+    }
+
+    /**
+     * @param array<string, mixed> $context
+     */
+    private function getInfo(array $context): string|Stringable
+    {
+        $message = $context[$this->messageKey] ?? null;
+
+        if (is_string($message) || $message instanceof Stringable) {
+            return $message;
+        }
+
+        return 'Knotlog entry';
+    }
 }

tests/Writer/LoggerWriterTest.php

@@ -25,7 +25,7 @@ public function it_writes_to_info_level_for_non_error_logs(): void
 
         $logger->expects($this->once())
             ->method('info')
-            ->with('{message}', ['message' => 'test', 'user_id' => 123]);
+            ->with('test', ['message' => 'test', 'user_id' => 123]);
 
         $logger->expects($this->never())
             ->method('error');
@@ -45,7 +45,7 @@ public function it_writes_to_error_level_for_error_logs(): void
 
         $logger->expects($this->once())
             ->method('error')
-            ->with('{error}', ['error' => 'Something went wrong', 'user_id' => 123]);
+            ->with('Something went wrong', ['error' => 'Something went wrong', 'user_id' => 123]);
 
         $logger->expects($this->never())
             ->method('info');
@@ -65,7 +65,7 @@ public function it_writes_to_error_level_for_exception_logs(): void
 
         $logger->expects($this->once())
             ->method('error')
-            ->with('{error}', ['exception' => 'RuntimeException', 'user_id' => 123]);
+            ->with('Knotlog error', ['exception' => 'RuntimeException', 'user_id' => 123]);
 
         $logger->expects($this->never())
             ->method('info');
@@ -85,7 +85,7 @@ public function it_uses_custom_message_key(): void
 
         $logger->expects($this->once())
             ->method('info')
-            ->with('{msg}', ['msg' => 'custom message', 'user_id' => 123]);
+            ->with('custom message', ['msg' => 'custom message', 'user_id' => 123]);
 
         $writer = new LoggerWriter($logger, messageKey: 'msg');
         $writer->write($log);
@@ -102,7 +102,7 @@ public function it_uses_custom_error_key(): void
 
         $logger->expects($this->once())
             ->method('error')
-            ->with('{err}', ['error' => 'Something went wrong', 'err' => 'custom error']);
+            ->with('custom error', ['error' => 'Something went wrong', 'err' => 'custom error']);
 
         $writer = new LoggerWriter($logger, errorKey: 'err');
         $writer->write($log);
@@ -128,7 +128,7 @@ public function it_passes_entire_log_context_to_logger(): void
 
         $logger->expects($this->once())
             ->method('info')
-            ->with('{message}', $expectedContext);
+            ->with('Knotlog entry', $expectedContext);
 
         $writer = new LoggerWriter($logger);
         $writer->write($log);