Revert 'Refactor logging implementation (#542)'

src/Consumer.php

@@ -18,13 +18,13 @@
 use FriendsOfHyperf\Trigger\Subscriber\TriggerSubscriber;
 use FriendsOfHyperf\Trigger\Traits\Logger;
 use Hyperf\Collection\Arr;
+use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Coordinator\Constants;
 use Hyperf\Coordinator\CoordinatorManager;
 use Hyperf\Coroutine\Coroutine;
 use MySQLReplication\Config\ConfigBuilder;
 use MySQLReplication\MySQLReplicationFactory;
 use MySQLReplication\Socket\SocketException;
-use Psr\Log\LoggerInterface;
 
 use function Hyperf\Support\make;
 use function Hyperf\Support\retry;
@@ -36,8 +36,6 @@ class Consumer
 
     protected ?string $name = null;
 
-    protected ?LoggerInterface $logger = null;
-
     private ?HealthMonitor $healthMonitor = null;
 
     private ?ServerMutexInterface $serverMutex = null;
@@ -50,7 +48,8 @@ public function __construct(
         protected SubscriberManager $subscriberManager,
         protected TriggerManager $triggerManager,
         protected string $connection = 'default',
-        protected array $options = []
+        protected array $options = [],
+        protected ?StdoutLoggerInterface $logger = null
     ) {
         if (isset($options['name'])) {
             $this->name = $options['name'];
@@ -71,8 +70,6 @@ public function __construct(
         if ($this->getOption('health_monitor.enable', true)) {
             $this->healthMonitor = make(HealthMonitor::class, ['consumer' => $this]);
         }
-
-        $this->logger = $this->getLogger();
     }
 
     public function start(): void

src/Monitor/HealthMonitor.php

@@ -15,13 +15,13 @@
 use FriendsOfHyperf\Trigger\Event\OnReplicationStop;
 use FriendsOfHyperf\Trigger\Snapshot\BinLogCurrentSnapshotInterface;
 use FriendsOfHyperf\Trigger\Traits\Logger;
+use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Coordinator\CoordinatorManager;
 use Hyperf\Coordinator\Timer;
 use Hyperf\Coroutine\Coroutine;
 use MySQLReplication\BinLog\BinLogCurrent;
 use Psr\Container\ContainerInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\Log\LoggerInterface;
 
 class HealthMonitor
 {
@@ -39,16 +39,20 @@ class HealthMonitor
 
     protected Timer $timer;
 
-    protected ?LoggerInterface $logger = null;
+    protected ?StdoutLoggerInterface $logger = null;
 
     public function __construct(protected ContainerInterface $container, protected Consumer $consumer)
     {
         $this->connection = $consumer->getConnection();
         $this->monitorInterval = (int) $consumer->getOption('health_monitor.interval', 10);
         $this->snapShortInterval = (int) $consumer->getOption('snapshot.interval', 10);
         $this->binLogCurrentSnapshot = $consumer->getBinLogCurrentSnapshot();
-        $this->logger = $this->getLogger();
-        $this->timer = new Timer($this->logger);
+        if ($container->has(StdoutLoggerInterface::class)) {
+            $this->logger = $container->get(StdoutLoggerInterface::class);
+        }
+        $this->timer = new Timer(
+            $this->logger instanceof StdoutLoggerInterface ? $this->logger : null
+        );
     }
 
     public function process(): void

src/SubscriberManager.php

@@ -12,24 +12,17 @@
 namespace FriendsOfHyperf\Trigger;
 
 use FriendsOfHyperf\Trigger\Annotation\Subscriber;
-use FriendsOfHyperf\Trigger\Traits\Logger;
 use Hyperf\Collection\Arr;
+use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Di\Annotation\AnnotationCollector;
-use Psr\Container\ContainerInterface;
-use Psr\Log\LoggerInterface;
 use SplPriorityQueue;
 
 class SubscriberManager
 {
-    use Logger;
-
     protected array $subscribers = [];
 
-    protected ?LoggerInterface $logger = null;
-
-    public function __construct(protected ContainerInterface $container)
+    public function __construct(protected ?StdoutLoggerInterface $logger = null)
     {
-        $this->logger = $this->getLogger();
     }
 
     public function register()
@@ -47,7 +40,7 @@ public function register()
             $this->subscribers[$property->connection] ??= [];
             $this->subscribers[$property->connection][] = $class;
 
-            $this->logger?->debug(sprintf(
+            $this->logger->debug(sprintf(
                 '[trigger.%s] %s registered by %s process by %s.',
                 $property->connection,
                 $this::class,

src/Traits/Logger.php

@@ -11,7 +11,6 @@
 
 namespace FriendsOfHyperf\Trigger\Traits;
 
-use FriendsOfHyperf\Trigger\Contact\LoggerInterface as ContactLoggerInterface;
 use Hyperf\Context\ApplicationContext;
 use Hyperf\Contract\StdoutLoggerInterface;
 use Psr\Log\LoggerInterface;
@@ -62,10 +61,10 @@ protected function getLogger(): ?LoggerInterface
 
         $container = ApplicationContext::getContainer();
 
-        return match (true) {
-            $container->has(ContactLoggerInterface::class) => $container->get(ContactLoggerInterface::class),
-            $container->has(StdoutLoggerInterface::class) => $container->get(StdoutLoggerInterface::class),
-            default => null,
-        };
+        if ($container->has(StdoutLoggerInterface::class)) {
+            return $container->get(StdoutLoggerInterface::class);
+        }
+
+        return null;
     }
 }