Enhanced Logging Configuration and Uvicorn Integration (#9)

Author: NFUChen

py_spring_core/__init__.py

@@ -16,7 +16,7 @@
 from py_spring_core.event.commons import ApplicationEvent
 from py_spring_core.event.application_event_handler_registry import EventListener
 
-__version__ = "0.0.14"
+__version__ = "0.0.15"
 
 __all__ = [
     "PySpringApplication",

py_spring_core/core/application/loguru_config.py

@@ -14,6 +14,10 @@ class LogLevel(str, Enum):
     CRITICAL = "CRITICAL"
 
 
+class LogFormat(str, Enum):
+    TEXT = "text"
+    JSON = "json"
+
 class LoguruConfig(BaseModel):
     log_format: str = (
         "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | "
@@ -27,3 +31,4 @@ class LoguruConfig(BaseModel):
     log_file_path: Optional[str] = "./logs/app.log"
     enable_backtrace: bool = True
     enable_diagnose: bool = True
+    format: LogFormat = LogFormat.TEXT

py_spring_core/core/application/py_spring_application.py

@@ -1,3 +1,4 @@
+import logging
 import os
 from typing import Any, Callable, Iterable, Type
 
@@ -21,6 +22,7 @@
 from py_spring_core.core.application.context.application_context_config import (
     ApplicationContextConfig,
 )
+from py_spring_core.core.application.loguru_config import LogFormat
 from py_spring_core.core.entities.bean_collection import BeanCollection
 from py_spring_core.core.entities.component import Component, ComponentLifeCycle
 from py_spring_core.core.entities.controllers.rest_controller import RestController
@@ -97,14 +99,16 @@ def __configure_logging(self):
         config = self.app_config.loguru_config
         if not config.log_file_path:
             return
-
+        
+        # Use the format field from config which contains the actual format string
         logger.add(
             config.log_file_path,
-            format=config.log_format,
             level=config.log_level,
             rotation=config.log_rotation,
             retention=config.log_retention,
+            serialize=config.format == LogFormat.JSON,
         )
+        self.__configure_uvicorn_logging()
 
     def _get_system_managed_classes(self) -> Iterable[Type[Component]]:
         return [
@@ -209,11 +213,40 @@ def __init_controllers(self) -> None:
             self.fastapi.include_router(router)
             controller.register_middlewares()
 
+    def __configure_uvicorn_logging(self):
+        """Configure Uvicorn to use Loguru instead of default logging."""
+        
+        
+        # Intercept standard logging and redirect to loguru
+        class InterceptHandler(logging.Handler):
+            def emit(self, record):
+                # Get corresponding Loguru level if it exists
+                try:
+                    level = logger.level(record.levelname).name
+                except ValueError:
+                    level = record.levelno
+
+                # Find caller from where originated the logged message
+                frame, depth = logging.currentframe(), 2
+                while frame and frame.f_code.co_filename == logging.__file__:
+                    frame = frame.f_back
+                    depth += 1
+
+                logger.opt(depth=depth, exception=record.exc_info).log(level, record.getMessage())
+
+        # Remove default uvicorn logger and add intercept handler
+        logging.basicConfig(handlers=[InterceptHandler()], level=0, force=True)
+
     def __run_server(self) -> None:
+        # Configure Uvicorn to use Loguru
+        
+        
+        # Run uvicorn server
         uvicorn.run(
             self.fastapi,
             host=self.app_config.server_config.host,
             port=self.app_config.server_config.port,
+            log_config=None,  # Disable uvicorn's default logging
         )
 
     def run(self) -> None:

py_spring_core/event/application_event_handler_registry.py

@@ -61,7 +61,7 @@ def post_construct(self) -> None:
         logger.info("Initializing event handlers...")
         self._init_event_handlers()
         logger.info("Starting event message handler thread...")
-        Thread(target= self._handle_messages).start()
+        Thread(target= self._handle_messages, daemon=True).start()
 
     def _init_event_handlers(self) -> None:
         app_context = self.get_application_context()