with more logger

libs/utils/logger/formatter.py

@@ -0,0 +1,25 @@
+#  -------------------------------
+#  Difficult Rocket
+#  Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
+#  All rights reserved
+#  -------------------------------
+
+import time
+
+from lib_not_dr.types.options import Options
+
+from .types import LogMessage
+
+
+class BaseFormatter(Options):
+    name = 'BaseFormatter'
+
+    def format(self, message: LogMessage) -> str:
+        raise NotImplementedError(f'{self.__class__.__name__}.format is not implemented')
+
+
+class TimeFormatter(BaseFormatter):
+    name = 'TimeFormatter'
+
+    def format(self, message: LogMessage) -> str:
+        return f'[{message.log_time}]'

libs/utils/logger/logger.py

@@ -4,6 +4,100 @@
 #  All rights reserved
 #  -------------------------------
 
+import time
+import inspect
+from types import FrameType
+from typing import List, Optional
+
+from .types import LogMessage
 from lib_not_dr.types.options import Options
 
 
+class BaseOutputStream(Options):
+    name = 'BaseOutputStream'
+
+    level: int = 20
+    enable: bool = True
+
+    def write_stdout(self, message: LogMessage) -> None:
+        raise NotImplementedError(f'{self.__class__.__name__}.write_stdout is not implemented')
+
+    def write_stderr(self, message: LogMessage) -> None:
+        raise NotImplementedError(f'{self.__class__.__name__}.write_stderr is not implemented')
+
+    def flush(self) -> None:
+        raise NotImplementedError(f'{self.__class__.__name__}.flush is not implemented')
+
+
+class Logger(Options):
+    name = 'Logger-v2'
+
+    outputs: List[BaseOutputStream] = []
+
+    enable: bool = True
+    level: int = 20
+
+    def log_for(self, level: int) -> bool:
+        """
+        Check if logging is enabled for a specific level.
+
+        Args:
+            level (int): The logging level to check.
+
+        Returns:
+            bool: True if logging is enabled for the given level, False otherwise.
+        """
+        return self.enable and level >= self.level
+
+    def add_output(self, output: BaseOutputStream) -> None:
+        """
+        Add an output to the list of outputs.
+
+        Args:
+            output (BaseOutputStream): The output to be added.
+
+        Returns:
+            None
+        """
+        self.outputs.append(output)
+        self.level = min(self.level, output.level)
+
+    def remove_output(self, output: BaseOutputStream) -> None:
+        """
+        Removes the specified output from the list of outputs.
+
+        Args:
+            output (BaseOutputStream): The output to be removed.
+
+        Returns:
+            None
+        """
+        self.outputs.remove(output)
+        self.level = max(self.level, *[output.level for output in self.outputs])
+
+    def make_log(self,
+                 messages: List[str],
+                 end: str = '\n',
+                 split: str = ' ',
+                 flush: bool = True,
+                 level: int = 20,
+                 logger_name: str = 'root',
+                 logger_tag: Optional[str] = None,
+                 stack_trace: Optional[FrameType] = None) -> None:
+        if not self.log_for(level):
+            return
+        if stack_trace is None:
+            if (stack := inspect.currentframe()) is not None:
+                if (up_stack := stack.f_back) is not None:
+                    stack_trace = up_stack
+                else:
+                    stack_trace = stack
+
+        message = LogMessage(messages=messages,
+                             end=end,
+                             split=split,
+                             flush=flush,
+                             level=level,
+                             logger_name=logger_name,
+                             logger_tag=logger_tag,
+                             stack_trace=stack_trace)

libs/utils/logger/types.py

@@ -23,9 +23,13 @@ class LogMessage(Options):
     # 消息的属性
     flush: bool = True
     level: int = 20
-    log_time: float = time.time_ns()
+    log_time: float = None
     logger_name: str = 'root'
     logger_tag: Optional[str] = None
     stack_trace: Optional[FrameType] = None
 
+    def init(self, **kwargs) -> bool:
+        if self.log_time is None:
+            self.log_time = time.time_ns()
+        return False