日志LogRecord记录时间信息

Author: liu21st

src/think/event/LogRecord.php

@@ -10,20 +10,26 @@
 // +----------------------------------------------------------------------
 namespace think\event;
 
+use DateTimeImmutable;
+
 /**
  * LogRecord事件类
  */
 class LogRecord
 {
     /** @var string */
-    public $type;
+    public string $type;
 
     /** @var string */
     public $message;
 
+    /** @var DateTimeImmutable */
+    public DateTimeImmutable $time;
+
     public function __construct($type, $message)
     {
         $this->type    = $type;
         $this->message = $message;
+        $this->time    = new DateTimeImmutable();
     }
 }

src/think/log/Channel.php

@@ -26,15 +26,15 @@ class Channel implements LoggerInterface
 
     /**
      * 日志信息
-     * @var array
+     * @var array<LogRecord>
      */
-    protected $log = [];
+    protected array $log = [];
 
     /**
      * 关闭日志
      * @var bool
      */
-    protected $close = false;
+    protected bool $close = false;
 
     public function __construct(protected string $name, protected LogHandlerInterface $logger, protected array $allow, protected bool $lazy, protected Event $event)
     {
@@ -85,10 +85,11 @@ public function record($msg, string $type = 'info', array $context = [], bool $l
             $msg = strtr($msg, $replace);
         }
 
-        if (!empty($msg) || 0 === $msg) {
-            $this->log[] = [$type, $msg];
+        if (!empty($msg)) {
+            $record      = new LogRecord($type, $msg);
+            $this->log[] = $record;
             if ($this->event) {
-                $this->event->trigger(new LogRecord($type, $msg));
+                $this->event->trigger($record);
             }
         }
 
@@ -128,16 +129,14 @@ public function getLog(): array
     public function save(): bool
     {
         $log = $this->log;
-
-        $this->log = [];
-
         if ($this->event) {
-            $event = new LogWrite($this->name, $log);
+            $event = new LogWrite($this->name, $this->log);
             $this->event->trigger($event);
             $log = $event->log;
         }
 
         $this->logger->save($log);
+        $this->log = [];
 
         return true;
     }

src/think/log/driver/File.php

@@ -14,6 +14,7 @@
 
 use think\App;
 use think\contract\LogHandlerInterface;
+use think\event\LogRecord;
 
 /**
  * 本地化调试输出到文件
@@ -59,7 +60,7 @@ public function __construct(App $app, $config = [])
     /**
      * 日志写入接口
      * @access public
-     * @param array $log 日志信息
+     * @param array<LogRecord> $log 日志信息
      * @return bool
      */
     public function save(array $log): bool
@@ -72,10 +73,10 @@ public function save(array $log): bool
         $messages = [];
 
         // 日志信息封装
-        $time = \DateTime::createFromFormat('0.u00 U', microtime())
-            ->setTimezone(new \DateTimeZone(date_default_timezone_get()))->format($this->config['time_format']);
-
-        foreach ($log as [$type, $msg]) {
+        foreach ($log as $record) {
+            $type = $record->type;
+            $msg  = $record->message;
+            $time = $record->time->format($this->config['time_format']);
             if (!is_string($msg)) {
                 $msg = var_export($msg, true);
             }

tests/LogTest.php

@@ -69,7 +69,7 @@ public function testFileLog()
 
         $this->log->info('foo');
 
-        $this->assertEquals([['info', 'foo']], $this->log->getLog());
+        $this->assertEquals([['info', 'foo']], array_map(fn($log) => [$log['type'], $log['message']], $this->log->getLog()));
 
         $this->log->clear();
 
@@ -95,7 +95,7 @@ public function testFileLog()
             ['debug', 'foo'],
             ['sql', 'foo'],
             ['custom', 'foo'],
-        ], $this->log->getLog());
+        ], array_map(fn($log) => [$log['type'], $log['message']], $this->log->getLog()));
 
         $this->log->write('foo');
         $this->assertTrue($root->hasChildren());