From 23a6e56478734d05e8a7dcc43120f89136ba05bd Mon Sep 17 00:00:00 2001
From: sunxyw <git@sunxyw.xyz>
Date: Tue, 31 May 2022 00:51:26 +0800
Subject: [PATCH] fix logger constructor

---
 config/logging.php                             | 12 ++++++------
 src/ZM/Container/ContainerServicesProvider.php |  2 +-
 src/ZM/global_functions.php                    |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/logging.php b/config/logging.php
index aae5cf16..3f8b2a98 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -7,17 +7,17 @@ use Psr\Log\LogLevel;
 use ZM\Logger\ConsoleLogger;
 
 return [
-    'level' => LogLevel::DEBUG,
-    'logger' => static function (string $title = null): LoggerInterface {
-        if ($title) {
-            $title = strtoupper($title);
+    'level' => LogLevel::INFO,
+    'logger' => static function (string $prefix = null): LoggerInterface {
+        if ($prefix) {
+            $prefix = strtoupper($prefix);
         } else {
             // 在 Master 中，worker_id 将不存在
-            $title = app()->has('worker_id') ? '#' . app('worker_id') : 'MST';
+            $prefix = app()->has('worker_id') ? '#' . app('worker_id') : 'MST';
         }
 
         $logger = new ConsoleLogger(zm_config('logging.level'));
-        $logger::$format = "[%date%] [%level%] [{$title}] %body%";
+        $logger::$format = "[%date%] [%level%] [{$prefix}] %body%";
         $logger::$date_format = 'Y-m-d H:i:s';
         // 如果你喜欢旧版的日志格式，请取消下行注释
 //        $logger::$date_format = 'm-d H:i:s';
diff --git a/src/ZM/Container/ContainerServicesProvider.php b/src/ZM/Container/ContainerServicesProvider.php
index 707e64a1..4fca8092 100644
--- a/src/ZM/Container/ContainerServicesProvider.php
+++ b/src/ZM/Container/ContainerServicesProvider.php
@@ -79,7 +79,7 @@ class ContainerServicesProvider
         $container->instance('worker_id', Framework::$server->worker_id);
 
         $container->singleton(AdapterInterface::class, OneBot11Adapter::class);
-        $container->singleton(LoggerInterface::class, ZMConfig::get('logging.logger'));
+        $container->instance(LoggerInterface::class, ZMConfig::get('logging.logger')());
     }
 
     /**
diff --git a/src/ZM/global_functions.php b/src/ZM/global_functions.php
index d41c5b5a..bf134725 100644
--- a/src/ZM/global_functions.php
+++ b/src/ZM/global_functions.php
@@ -788,10 +788,10 @@ function is_assoc_array(array $array): bool
 /**
  * 返回 Logger 实例
  */
-function logger(...$args): LoggerInterface
+function logger(string $prefix = null): LoggerInterface
 {
-    if (!app()->has(LoggerInterface::class)) {
-        return zm_config('logging.logger')(...$args);
+    if (!is_null($prefix) || !app()->has(LoggerInterface::class)) {
+        return zm_config('logging.logger')($prefix);
     }
     return resolve(LoggerInterface::class);
 }