From 8ab9ede9c6fb605f1077400969bda07adb8dac96 Mon Sep 17 00:00:00 2001
From: "evgeny.iva" <evgeny.iva@cadolabs.io>
Date: Thu, 23 Mar 2023 15:33:09 +0300
Subject: [PATCH] Change log levels to enum

---
 src/Integration/Laravel/InfluxDBLogChannel.php | 3 ++-
 src/Integration/Laravel/TelegrafLogChannel.php | 3 ++-
 src/Monolog/Handler/InfluxDBHandler.php        | 4 ++--
 src/Monolog/Handler/TelegrafHandler.php        | 4 ++--
 tests/unit/Logging/FormatterTest.php           | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Integration/Laravel/InfluxDBLogChannel.php b/src/Integration/Laravel/InfluxDBLogChannel.php
index 78761c7..ddfc66a 100644
--- a/src/Integration/Laravel/InfluxDBLogChannel.php
+++ b/src/Integration/Laravel/InfluxDBLogChannel.php
@@ -6,6 +6,7 @@
 
 use Illuminate\Log\LogManager;
 use InfluxDB\Database;
+use Monolog\Level;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
 use Umbrellio\TableSync\Monolog\Handler\InfluxDBHandler;
@@ -17,7 +18,7 @@ public function __invoke(array $config): LoggerInterface
         $handler = new InfluxDBHandler(
             $this->app->make(Database::class),
             $config['measurement'] ?? null,
-            $config['level'] ?? Logger::INFO,
+            $config['level'] ?? Level::Info,
             $config['bubble'] ?? true
         );
 
diff --git a/src/Integration/Laravel/TelegrafLogChannel.php b/src/Integration/Laravel/TelegrafLogChannel.php
index 63ae49f..a8f58b7 100644
--- a/src/Integration/Laravel/TelegrafLogChannel.php
+++ b/src/Integration/Laravel/TelegrafLogChannel.php
@@ -5,6 +5,7 @@
 namespace Umbrellio\TableSync\Integration\Laravel;
 
 use Illuminate\Log\LogManager;
+use Monolog\Level;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
 use Umbrellio\TableSync\Monolog\Handler\TelegrafHandler;
@@ -17,7 +18,7 @@ public function __invoke(array $config): LoggerInterface
             config('telegraf.host'),
             config('telegraf.port'),
             $config['measurement'] ?? null,
-            $config['level'] ?? Logger::INFO,
+            $config['level'] ?? Level::Info,
             $config['bubble'] ?? true
         );
 
diff --git a/src/Monolog/Handler/InfluxDBHandler.php b/src/Monolog/Handler/InfluxDBHandler.php
index e9c8e05..d8a4ac9 100644
--- a/src/Monolog/Handler/InfluxDBHandler.php
+++ b/src/Monolog/Handler/InfluxDBHandler.php
@@ -9,7 +9,7 @@
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Handler\HandlerInterface;
-use Monolog\Logger;
+use Monolog\Level;
 use Monolog\LogRecord;
 use Umbrellio\TableSync\Monolog\Formatter\InfluxDBFormatter;
 use Umbrellio\TableSync\Monolog\Formatter\TableSyncFormatter;
@@ -19,7 +19,7 @@ class InfluxDBHandler extends AbstractProcessingHandler
     public function __construct(
         private readonly Database $database,
         private readonly string $measurement = 'table_sync',
-        int $level = Logger::INFO,
+        int|string|Level $level = Level::Info,
         bool $bubble = true
     ) {
         parent::__construct($level, $bubble);
diff --git a/src/Monolog/Handler/TelegrafHandler.php b/src/Monolog/Handler/TelegrafHandler.php
index b37b7a8..289d95b 100644
--- a/src/Monolog/Handler/TelegrafHandler.php
+++ b/src/Monolog/Handler/TelegrafHandler.php
@@ -7,7 +7,7 @@
 use InfluxDB\Driver\UDP;
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Handler\AbstractProcessingHandler;
-use Monolog\Logger;
+use Monolog\Level;
 use Monolog\LogRecord;
 use Umbrellio\TableSync\Monolog\Formatter\InfluxDBFormatter;
 
@@ -19,7 +19,7 @@ public function __construct(
         $host,
         $port,
         private readonly string $measurement = 'table_sync',
-        $level = Logger::INFO,
+        int|string|Level $level = Level::Info,
         $bubble = true
     ) {
         parent::__construct($level, $bubble);
diff --git a/tests/unit/Logging/FormatterTest.php b/tests/unit/Logging/FormatterTest.php
index 54bd225..eac7d0c 100644
--- a/tests/unit/Logging/FormatterTest.php
+++ b/tests/unit/Logging/FormatterTest.php
@@ -89,7 +89,8 @@ public function jsonTableSyncFormat(): void
         $dateTime = new DateTimeImmutable();
         $format = $jsonTableSyncFormatter->format($this->getDummyRecord($dateTime));
         $expected = '{"datetime":"' . $dateTime->format('Y-m-d\TH:i:s.uP') .
-            '","message":"message","direction":"direction","routing":"routing_key","model":"model","event":"update","count":1}' . "\n";
+            '","message":"message","direction":"direction","routing":"routing_key",' .
+            '"model":"model","event":"update","count":1}' . "\n";
         $this->assertIsString($format);
         $this->assertSame($expected, $format);
     }