[improvement]Optimize and refactor the log system (#21)

* add logger system AND fix Readme

doris_mcp_server/main.py

@@ -214,8 +214,7 @@ from .utils.db import DorisConnectionManager
 from .utils.security import DorisSecurityManager
 import os
 
-# Configure logging
-logging.basicConfig(level=logging.INFO)
+# Configure logging - will be properly initialized later
 logger = logging.getLogger(__name__)
 
 # Create a default config instance for getting default values
@@ -240,7 +239,9 @@ class DorisServer:
         self.tools_manager = DorisToolsManager(self.connection_manager)
         self.prompts_manager = DorisPromptsManager(self.connection_manager)
 
-        self.logger = logging.getLogger(f"{__name__}.DorisServer")
+        # Import here to avoid circular imports
+        from .utils.logger import get_logger
+        self.logger = get_logger(f"{__name__}.DorisServer")
         self._setup_handlers()
 
     def _get_mcp_capabilities(self):
@@ -679,9 +680,6 @@ async def main():
     parser = create_arg_parser()
     args = parser.parse_args()
 
-    # Set log level
-    logging.getLogger().setLevel(getattr(logging, args.log_level))
-
     # Create configuration - priority: command line arguments > .env file > default values
     config = DorisConfig.from_env()  # First load from .env file and environment variables
     
@@ -699,6 +697,22 @@ async def main():
     if args.log_level != _default_config.logging.level:
         config.logging.level = args.log_level
 
+    # Initialize enhanced logging system
+    from .utils.config import ConfigManager
+    config_manager = ConfigManager(config)
+    config_manager.setup_logging()
+    
+    # Get logger with proper configuration
+    from .utils.logger import get_logger, log_system_info
+    logger = get_logger(__name__)
+    
+    # Log system information for debugging
+    log_system_info()
+    
+    logger.info("Starting Doris MCP Server...")
+    logger.info(f"Transport: {args.transport}")
+    logger.info(f"Log Level: {config.logging.level}")
+
     # Create server instance
     server = DorisServer(config)
 
@@ -728,6 +742,10 @@ async def main():
             await server.shutdown()
         except Exception as shutdown_error:
             logger.error(f"Error occurred while shutting down server: {shutdown_error}")
+        
+        # Shutdown logging system
+        from .utils.logger import shutdown_logging
+        shutdown_logging()
 
     return 0
 

doris_mcp_server/utils/config.py

@@ -32,6 +32,8 @@ try:
 except ImportError:
     load_dotenv = None
 
+from .logger import get_logger
+
 
 @dataclass
 class DatabaseConfig:
@@ -144,6 +146,11 @@ class LoggingConfig:
     # Audit log configuration
     enable_audit: bool = True
     audit_file_path: str | None = None
+    
+    # Log cleanup configuration
+    enable_cleanup: bool = True
+    max_age_days: int = 30
+    cleanup_interval_hours: int = 24
 
 
 @dataclass
@@ -327,6 +334,15 @@ class DorisConfig:
             os.getenv("ENABLE_AUDIT", str(config.logging.enable_audit).lower()).lower() == "true"
         )
         config.logging.audit_file_path = os.getenv("AUDIT_FILE_PATH", config.logging.audit_file_path)
+        config.logging.enable_cleanup = (
+            os.getenv("ENABLE_LOG_CLEANUP", str(config.logging.enable_cleanup).lower()).lower() == "true"
+        )
+        config.logging.max_age_days = int(
+            os.getenv("LOG_MAX_AGE_DAYS", str(config.logging.max_age_days))
+        )
+        config.logging.cleanup_interval_hours = int(
+            os.getenv("LOG_CLEANUP_INTERVAL_HOURS", str(config.logging.cleanup_interval_hours))
+        )
 
         # Monitoring configuration
         config.monitoring.enable_metrics = (
@@ -454,6 +470,9 @@ class DorisConfig:
                 "backup_count": self.logging.backup_count,
                 "enable_audit": self.logging.enable_audit,
                 "audit_file_path": self.logging.audit_file_path,
+                "enable_cleanup": self.logging.enable_cleanup,
+                "max_age_days": self.logging.max_age_days,
+                "cleanup_interval_hours": self.logging.cleanup_interval_hours,
             },
             "monitoring": {
                 "enable_metrics": self.monitoring.enable_metrics,
@@ -531,6 +550,12 @@ class DorisConfig:
 
         if self.logging.backup_count < 0:
             errors.append("Log backup count cannot be negative")
+        
+        if self.logging.max_age_days <= 0:
+            errors.append("Log max age days must be greater than 0")
+        
+        if self.logging.cleanup_interval_hours <= 0:
+            errors.append("Log cleanup interval hours must be greater than 0")
 
         # Validate monitoring configuration
         if not (1 <= self.monitoring.metrics_port <= 65535):
@@ -576,56 +601,41 @@ class ConfigManager:
         self.logger = logging.getLogger(__name__)
 
     def setup_logging(self):
-        """Setup logging configuration"""
-        # Configure root logger
-        root_logger = logging.getLogger()
-        root_logger.setLevel(getattr(logging, self.config.logging.level.upper()))
-
-        # Clear existing handlers
-        for handler in root_logger.handlers[:]:
-            root_logger.removeHandler(handler)
-
-        # Create formatter
-        formatter = logging.Formatter(self.config.logging.format)
-
-        # Console handler
-        console_handler = logging.StreamHandler()
-        console_handler.setFormatter(formatter)
-        root_logger.addHandler(console_handler)
-
-        # File handler (if configured)
+        """Setup logging configuration using enhanced logger"""
+        from .logger import setup_logging, get_logger
+        
+        # Determine log directory
+        log_dir = "logs"
         if self.config.logging.file_path:
-            try:
-                from logging.handlers import RotatingFileHandler
-
-                file_handler = RotatingFileHandler(
-                    self.config.logging.file_path,
-                    maxBytes=self.config.logging.max_file_size,
-                    backupCount=self.config.logging.backup_count,
-                    encoding="utf-8",
-                )
-                file_handler.setFormatter(formatter)
-                root_logger.addHandler(file_handler)
-            except Exception as e:
-                self.logger.warning(f"Failed to setup file logging: {e}")
-
-        # Audit log handler (if configured)
-        if self.config.logging.enable_audit and self.config.logging.audit_file_path:
-            try:
-                from logging.handlers import RotatingFileHandler
-
-                audit_logger = logging.getLogger("audit")
-                audit_handler = RotatingFileHandler(
-                    self.config.logging.audit_file_path,
-                    maxBytes=self.config.logging.max_file_size,
-                    backupCount=self.config.logging.backup_count,
-                    encoding="utf-8",
-                )
-                audit_handler.setFormatter(formatter)
-                audit_logger.addHandler(audit_handler)
-                audit_logger.setLevel(logging.INFO)
-            except Exception as e:
-                self.logger.warning(f"Failed to setup audit logging: {e}")
+            # Extract directory from file path if provided
+            from pathlib import Path
+            log_dir = str(Path(self.config.logging.file_path).parent)
+        
+        # Setup enhanced logging with cleanup functionality
+        setup_logging(
+            level=self.config.logging.level,
+            log_dir=log_dir,
+            enable_console=True,
+            enable_file=True,
+            enable_audit=self.config.logging.enable_audit,
+            audit_file=self.config.logging.audit_file_path,
+            max_file_size=self.config.logging.max_file_size,
+            backup_count=self.config.logging.backup_count,
+            enable_cleanup=self.config.logging.enable_cleanup,
+            max_age_days=self.config.logging.max_age_days,
+            cleanup_interval_hours=self.config.logging.cleanup_interval_hours
+        )
+        
+        # Update logger to use new system
+        self.logger = get_logger(__name__)
+        
+        self.logger.info("Enhanced logging system with cleanup initialized successfully")
+        self.logger.info(f"Log directory: {log_dir}")
+        self.logger.info(f"Log level: {self.config.logging.level}")
+        self.logger.info(f"Audit logging: {'Enabled' if self.config.logging.enable_audit else 'Disabled'}")
+        self.logger.info(f"Log cleanup: {'Enabled' if self.config.logging.enable_cleanup else 'Disabled'}")
+        if self.config.logging.enable_cleanup:
+            self.logger.info(f"Cleanup config: Max age {self.config.logging.max_age_days} days, interval {self.config.logging.cleanup_interval_hours}h")
 
     def validate_config(self) -> bool:
         """Validate configuration"""

doris_mcp_server/utils/db.py

@@ -34,6 +34,8 @@ import random
 import aiomysql
 from aiomysql import Connection, Pool
 
+from .logger import get_logger
+
 
 
 
@@ -71,7 +73,7 @@ class DorisConnection:
         self.query_count = 0
         self.is_healthy = True
         self.security_manager = security_manager
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
 
     async def execute(self, sql: str, params: tuple | None = None, auth_context=None) -> QueryResult:
         """Execute SQL query"""
@@ -200,7 +202,7 @@ class DorisConnectionManager:
         self.config = config
         self.security_manager = security_manager
         self.pool: Pool | None = None
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
         self.metrics = ConnectionMetrics()
         
         # Remove session-level connection management
@@ -712,7 +714,7 @@ class ConnectionPoolMonitor:
 
     def __init__(self, connection_manager: DorisConnectionManager):
         self.connection_manager = connection_manager
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
 
     async def get_pool_status(self) -> dict[str, Any]:
         """Get connection pool status"""

doris_mcp_server/utils/logger.py

@@ -15,87 +15,615 @@
 # specific language governing permissions and limitations
 # under the License.
 """
-Logging configuration for Doris MCP Server.
+Enhanced Logging configuration for Doris MCP Server.
+Features:
+- Log level-based file separation
+- Timestamped log entries
+- Automatic log rotation
+- Comprehensive logging coverage
 """
 
 import logging
 import logging.config
+import logging.handlers
 import sys
+import os
+import asyncio
+import time
 from pathlib import Path
-from typing import Any
+from typing import Any, Optional
+from datetime import datetime, timedelta
+import threading
 
 
-def setup_logging(
-    level: str = "INFO",
-    log_file: str | None = None,
-    log_format: str | None = None,
-) -> None:
-    """
-    Setup logging configuration.
+class TimestampedFormatter(logging.Formatter):
+    """Custom formatter with enhanced timestamp and structured format"""
+    
+    def __init__(self, fmt=None, datefmt=None, style='%'):
+        if fmt is None:
+            fmt = "%(asctime)s.%(msecs)03d %(level_aligned)s %(name)s:%(lineno)d - %(message)s"
+        if datefmt is None:
+            datefmt = "%Y-%m-%d %H:%M:%S"
+        super().__init__(fmt, datefmt, style)
+    
+    def format(self, record):
+        """Format log record with enhanced information and proper alignment"""
+        # Add process info if available
+        if hasattr(record, 'process') and record.process:
+            record.process_info = f"[PID:{record.process}]"
+        else:
+            record.process_info = ""
+        
+        # Add thread info if available
+        if hasattr(record, 'thread') and record.thread:
+            record.thread_info = f"[TID:{record.thread}]"
+        else:
+            record.thread_info = ""
+        
+        # Format with proper alignment after the level name
+        # Calculate padding needed for alignment
+        level_name = record.levelname
+        max_level_length = 8  # Length of "CRITICAL"
+        padding = max_level_length - len(level_name)
+        record.level_aligned = f"[{level_name}]{' ' * padding}"
+        
+        return super().format(record)
 
-    Args:
-        level: Logging level (DEBUG, INFO, WARNING, ERROR)
-        log_file: Optional log file path
-        log_format: Optional custom log format
-    """
-    if log_format is None:
-        log_format = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
 
-    # Base configuration
-    config: dict[str, Any] = {
-        "version": 1,
-        "disable_existing_loggers": False,
-        "formatters": {
-            "default": {"format": log_format, "datefmt": "%Y-%m-%d %H:%M:%S"}
-        },
-        "handlers": {
-            "console": {
-                "class": "logging.StreamHandler",
-                "level": level,
-                "formatter": "default",
-                "stream": sys.stdout,
-            }
-        },
-        "root": {"level": level, "handlers": ["console"]},
-        "loggers": {
-            "doris_mcp_server": {
-                "level": level,
-                "handlers": ["console"],
-                "propagate": False,
-            }
-        },
-    }
-
-    # Add file handler if log_file is specified
-    if log_file:
+class LevelBasedFileHandler(logging.Handler):
+    """Custom handler that writes different log levels to different files"""
+    
+    def __init__(self, log_dir: str, base_name: str = "doris_mcp_server", 
+                 max_bytes: int = 10*1024*1024, backup_count: int = 5):
+        super().__init__()
+        self.log_dir = Path(log_dir)
+        self.base_name = base_name
+        self.max_bytes = max_bytes
+        self.backup_count = backup_count
+        
         # Ensure log directory exists
-        log_path = Path(log_file)
-        log_path.parent.mkdir(parents=True, exist_ok=True)
-
-        config["handlers"]["file"] = {
-            "class": "logging.handlers.RotatingFileHandler",
-            "level": level,
-            "formatter": "default",
-            "filename": log_file,
-            "maxBytes": 10485760,  # 10MB
-            "backupCount": 5,
+        self.log_dir.mkdir(parents=True, exist_ok=True)
+        
+        # Create handlers for different log levels
+        self.handlers = {}
+        self._setup_level_handlers()
+    
+    def _setup_level_handlers(self):
+        """Setup rotating file handlers for different log levels"""
+        level_files = {
+            'DEBUG': 'debug.log',
+            'INFO': 'info.log', 
+            'WARNING': 'warning.log',
+            'ERROR': 'error.log',
+            'CRITICAL': 'critical.log'
         }
+        
+        formatter = TimestampedFormatter()
+        
+        for level, filename in level_files.items():
+            file_path = self.log_dir / f"{self.base_name}_{filename}"
+            handler = logging.handlers.RotatingFileHandler(
+                file_path, 
+                maxBytes=self.max_bytes,
+                backupCount=self.backup_count,
+                encoding='utf-8'
+            )
+            handler.setFormatter(formatter)
+            handler.setLevel(getattr(logging, level))
+            self.handlers[level] = handler
+    
+    def emit(self, record):
+        """Emit log record to appropriate level-based file"""
+        level_name = record.levelname
+        if level_name in self.handlers:
+            try:
+                self.handlers[level_name].emit(record)
+            except Exception:
+                self.handleError(record)
+    
+    def close(self):
+        """Close all handlers"""
+        for handler in self.handlers.values():
+            handler.close()
+        super().close()
 
-        # Add file handler to root and package loggers
-        config["root"]["handlers"].append("file")
-        config["loggers"]["doris_mcp_server"]["handlers"].append("file")
 
-    logging.config.dictConfig(config)
+class LogCleanupManager:
+    """Log file cleanup manager for automatic maintenance"""
+    
+    def __init__(self, log_dir: str, max_age_days: int = 30, cleanup_interval_hours: int = 24):
+        """
+        Initialize log cleanup manager.
+        
+        Args:
+            log_dir: Directory containing log files
+            max_age_days: Maximum age of log files in days (default: 30 days)
+            cleanup_interval_hours: Cleanup interval in hours (default: 24 hours)
+        """
+        self.log_dir = Path(log_dir)
+        self.max_age_days = max_age_days
+        self.cleanup_interval_hours = cleanup_interval_hours
+        self.cleanup_thread = None
+        self.stop_event = threading.Event()
+        self.logger = None
+    
+    def start_cleanup_scheduler(self):
+        """Start the cleanup scheduler in a background thread"""
+        if self.cleanup_thread and self.cleanup_thread.is_alive():
+            return
+        
+        self.stop_event.clear()
+        self.cleanup_thread = threading.Thread(target=self._cleanup_loop, daemon=True)
+        self.cleanup_thread.start()
+        
+        # Get logger for this class
+        if not self.logger:
+            self.logger = logging.getLogger("doris_mcp_server.log_cleanup")
+        
+        self.logger.info(f"Log cleanup scheduler started - cleanup every {self.cleanup_interval_hours}h, max age {self.max_age_days} days")
+    
+    def stop_cleanup_scheduler(self):
+        """Stop the cleanup scheduler"""
+        if self.cleanup_thread and self.cleanup_thread.is_alive():
+            self.stop_event.set()
+            self.cleanup_thread.join(timeout=5)
+            if self.logger:
+                self.logger.info("Log cleanup scheduler stopped")
+    
+    def _cleanup_loop(self):
+        """Background loop for periodic cleanup"""
+        while not self.stop_event.is_set():
+            try:
+                self.cleanup_old_logs()
+                # Sleep for the specified interval, but check stop event every 60 seconds
+                for _ in range(self.cleanup_interval_hours * 60):  # Convert hours to minutes
+                    if self.stop_event.wait(60):  # Wait 60 seconds or until stop event
+                        break
+            except Exception as e:
+                if self.logger:
+                    self.logger.error(f"Error in log cleanup loop: {e}")
+                # Sleep for 5 minutes before retrying
+                self.stop_event.wait(300)
+    
+    def cleanup_old_logs(self):
+        """Clean up old log files based on age"""
+        if not self.log_dir.exists():
+            return
+        
+        current_time = datetime.now()
+        cutoff_time = current_time - timedelta(days=self.max_age_days)
+        
+        cleaned_files = []
+        cleaned_size = 0
+        
+        # Pattern for log files (including backup files)
+        log_patterns = [
+            "doris_mcp_server_*.log",
+            "doris_mcp_server_*.log.*"  # Backup files
+        ]
+        
+        for pattern in log_patterns:
+            for log_file in self.log_dir.glob(pattern):
+                try:
+                    # Get file modification time
+                    file_mtime = datetime.fromtimestamp(log_file.stat().st_mtime)
+                    
+                    if file_mtime < cutoff_time:
+                        file_size = log_file.stat().st_size
+                        log_file.unlink()  # Delete the file
+                        cleaned_files.append(log_file.name)
+                        cleaned_size += file_size
+                        
+                except Exception as e:
+                    if self.logger:
+                        self.logger.warning(f"Failed to cleanup log file {log_file}: {e}")
+        
+        if cleaned_files and self.logger:
+            size_mb = cleaned_size / (1024 * 1024)
+            self.logger.info(f"Cleaned up {len(cleaned_files)} old log files, freed {size_mb:.2f} MB")
+            self.logger.debug(f"Cleaned files: {', '.join(cleaned_files)}")
+    
+    def get_cleanup_stats(self) -> dict:
+        """Get statistics about log files and cleanup status"""
+        if not self.log_dir.exists():
+            return {"error": "Log directory does not exist"}
+        
+        stats = {
+            "log_directory": str(self.log_dir.absolute()),
+            "max_age_days": self.max_age_days,
+            "cleanup_interval_hours": self.cleanup_interval_hours,
+            "scheduler_running": self.cleanup_thread and self.cleanup_thread.is_alive(),
+            "total_files": 0,
+            "total_size_mb": 0,
+            "files_by_age": {"recent": 0, "old": 0},
+            "oldest_file": None,
+            "newest_file": None
+        }
+        
+        current_time = datetime.now()
+        cutoff_time = current_time - timedelta(days=self.max_age_days)
+        oldest_time = None
+        newest_time = None
+        
+        log_patterns = ["doris_mcp_server_*.log", "doris_mcp_server_*.log.*"]
+        
+        for pattern in log_patterns:
+            for log_file in self.log_dir.glob(pattern):
+                try:
+                    file_stat = log_file.stat()
+                    file_mtime = datetime.fromtimestamp(file_stat.st_mtime)
+                    
+                    stats["total_files"] += 1
+                    stats["total_size_mb"] += file_stat.st_size / (1024 * 1024)
+                    
+                    if file_mtime < cutoff_time:
+                        stats["files_by_age"]["old"] += 1
+                    else:
+                        stats["files_by_age"]["recent"] += 1
+                    
+                    if oldest_time is None or file_mtime < oldest_time:
+                        oldest_time = file_mtime
+                        stats["oldest_file"] = {"name": log_file.name, "age_days": (current_time - file_mtime).days}
+                    
+                    if newest_time is None or file_mtime > newest_time:
+                        newest_time = file_mtime
+                        stats["newest_file"] = {"name": log_file.name, "age_days": (current_time - file_mtime).days}
+                        
+                except Exception:
+                    continue
+        
+        stats["total_size_mb"] = round(stats["total_size_mb"], 2)
+        
+        return stats
+
+
+class DorisLoggerManager:
+    """Centralized logger manager for Doris MCP Server"""
+    
+    def __init__(self):
+        self.is_initialized = False
+        self.log_dir = None
+        self.config = None
+        self.loggers = {}
+        self.cleanup_manager = None
+    
+    def setup_logging(self, 
+                     level: str = "INFO",
+                     log_dir: str = "logs",
+                     enable_console: bool = True,
+                     enable_file: bool = True,
+                     enable_audit: bool = True,
+                     audit_file: Optional[str] = None,
+                     max_file_size: int = 10*1024*1024,
+                     backup_count: int = 5,
+                     enable_cleanup: bool = True,
+                     max_age_days: int = 30,
+                     cleanup_interval_hours: int = 24) -> None:
+        """
+        Setup comprehensive logging configuration.
+        
+        Args:
+            level: Base logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)
+            log_dir: Directory for log files
+            enable_console: Enable console output
+            enable_file: Enable file logging
+            enable_audit: Enable audit logging
+            audit_file: Custom audit log file path
+            max_file_size: Maximum size per log file (bytes)
+            backup_count: Number of backup files to keep
+            enable_cleanup: Enable automatic log cleanup
+            max_age_days: Maximum age of log files in days (default: 30)
+            cleanup_interval_hours: Cleanup interval in hours (default: 24)
+        """
+        if self.is_initialized:
+            return
+        
+        self.log_dir = Path(log_dir)
+        self.log_dir.mkdir(parents=True, exist_ok=True)
+        
+        # Clear existing handlers
+        root_logger = logging.getLogger()
+        for handler in root_logger.handlers[:]:
+            root_logger.removeHandler(handler)
+        
+        # Set root logger level
+        root_logger.setLevel(logging.DEBUG)  # Allow all levels, handlers will filter
+        
+        handlers = []
+        
+        # Console handler
+        if enable_console:
+            console_handler = logging.StreamHandler(sys.stdout)
+            console_handler.setLevel(getattr(logging, level.upper()))
+            console_formatter = TimestampedFormatter(
+                fmt="%(asctime)s.%(msecs)03d %(level_aligned)s %(name)s - %(message)s",
+                datefmt="%Y-%m-%d %H:%M:%S"
+            )
+            console_handler.setFormatter(console_formatter)
+            handlers.append(console_handler)
+        
+        # Level-based file handlers
+        if enable_file:
+            level_handler = LevelBasedFileHandler(
+                log_dir=str(self.log_dir),
+                base_name="doris_mcp_server",
+                max_bytes=max_file_size,
+                backup_count=backup_count
+            )
+            level_handler.setLevel(logging.DEBUG)  # Accept all levels
+            handlers.append(level_handler)
+        
+        # Combined application log (all levels in one file)
+        if enable_file:
+            app_log_file = self.log_dir / "doris_mcp_server_all.log"
+            app_handler = logging.handlers.RotatingFileHandler(
+                app_log_file,
+                maxBytes=max_file_size,
+                backupCount=backup_count,
+                encoding='utf-8'
+            )
+            app_handler.setLevel(getattr(logging, level.upper()))
+            app_formatter = TimestampedFormatter()
+            app_handler.setFormatter(app_formatter)
+            handlers.append(app_handler)
+        
+        # Audit logger (separate from main logging)
+        if enable_audit:
+            audit_file_path = audit_file or str(self.log_dir / "doris_mcp_server_audit.log")
+            audit_logger = logging.getLogger("audit")
+            audit_logger.setLevel(logging.INFO)
+            
+            # Clear existing audit handlers
+            for handler in audit_logger.handlers[:]:
+                audit_logger.removeHandler(handler)
+            
+            audit_handler = logging.handlers.RotatingFileHandler(
+                audit_file_path,
+                maxBytes=max_file_size,
+                backupCount=backup_count,
+                encoding='utf-8'
+            )
+            audit_formatter = TimestampedFormatter(
+                fmt="%(asctime)s.%(msecs)03d [AUDIT] %(name)s - %(message)s",
+                datefmt="%Y-%m-%d %H:%M:%S"
+            )
+            audit_handler.setFormatter(audit_formatter)
+            audit_logger.addHandler(audit_handler)
+            audit_logger.propagate = False  # Don't propagate to root logger
+        
+        # Add all handlers to root logger
+        for handler in handlers:
+            root_logger.addHandler(handler)
+        
+        # Setup package-specific loggers
+        self._setup_package_loggers(level)
+        
+        # Setup log cleanup manager
+        if enable_cleanup and enable_file:
+            self.cleanup_manager = LogCleanupManager(
+                log_dir=str(self.log_dir),
+                max_age_days=max_age_days,
+                cleanup_interval_hours=cleanup_interval_hours
+            )
+            self.cleanup_manager.start_cleanup_scheduler()
+        
+        self.is_initialized = True
+        
+        # Log initialization message
+        logger = self.get_logger("doris_mcp_server.logger")
+        logger.info("=" * 80)
+        logger.info("Doris MCP Server Logging System Initialized")
+        logger.info(f"Log Level: {level}")
+        logger.info(f"Log Directory: {self.log_dir.absolute()}")
+        logger.info(f"Console Logging: {'Enabled' if enable_console else 'Disabled'}")
+        logger.info(f"File Logging: {'Enabled' if enable_file else 'Disabled'}")
+        logger.info(f"Audit Logging: {'Enabled' if enable_audit else 'Disabled'}")
+        logger.info(f"Log Cleanup: {'Enabled' if enable_cleanup and enable_file else 'Disabled'}")
+        if enable_cleanup and enable_file:
+            logger.info(f"Cleanup Settings: Max age {max_age_days} days, interval {cleanup_interval_hours}h")
+        logger.info("=" * 80)
+    
+    def _setup_package_loggers(self, level: str):
+        """Setup specific loggers for different modules"""
+        package_loggers = [
+            "doris_mcp_server",
+            "doris_mcp_server.main",
+            "doris_mcp_server.utils",
+            "doris_mcp_server.tools",
+            "doris_mcp_client"
+        ]
+        
+        for logger_name in package_loggers:
+            logger = logging.getLogger(logger_name)
+            logger.setLevel(getattr(logging, level.upper()))
+            # Don't add handlers here - they inherit from root logger
+    
+    def get_logger(self, name: str) -> logging.Logger:
+        """
+        Get a logger instance with proper configuration.
+        
+        Args:
+            name: Logger name (usually __name__)
+            
+        Returns:
+            Configured logger instance
+        """
+        if name not in self.loggers:
+            logger = logging.getLogger(name)
+            self.loggers[name] = logger
+        
+        return self.loggers[name]
+    
+    def get_audit_logger(self) -> logging.Logger:
+        """Get the audit logger"""
+        return logging.getLogger("audit")
+    
+    def log_system_info(self):
+        """Log system information for debugging"""
+        logger = self.get_logger("doris_mcp_server.system")
+        logger.info("System Information:")
+        logger.info(f"Python Version: {sys.version}")
+        logger.info(f"Platform: {sys.platform}")
+        logger.info(f"Working Directory: {os.getcwd()}")
+        logger.info(f"Process ID: {os.getpid()}")
+        
+        # Log environment variables (filtered)
+        env_vars = ["LOG_LEVEL", "LOG_FILE_PATH", "ENABLE_AUDIT", "AUDIT_FILE_PATH"]
+        for var in env_vars:
+            value = os.getenv(var, "Not Set")
+            logger.info(f"Environment {var}: {value}")
+    
+    def get_cleanup_stats(self) -> dict:
+        """Get log cleanup statistics"""
+        if self.cleanup_manager:
+            return self.cleanup_manager.get_cleanup_stats()
+        else:
+            return {"error": "Log cleanup is not enabled"}
+    
+    def manual_cleanup(self) -> dict:
+        """Manually trigger log cleanup and return statistics"""
+        if self.cleanup_manager:
+            self.cleanup_manager.cleanup_old_logs()
+            return self.cleanup_manager.get_cleanup_stats()
+        else:
+            return {"error": "Log cleanup is not enabled"}
+    
+    def shutdown(self):
+        """Shutdown logging system"""
+        if not self.is_initialized:
+            return
+        
+        logger = self.get_logger("doris_mcp_server.logger")
+        logger.info("Shutting down logging system...")
+        
+        # Stop cleanup manager
+        if self.cleanup_manager:
+            self.cleanup_manager.stop_cleanup_scheduler()
+        
+        # Close all handlers
+        root_logger = logging.getLogger()
+        for handler in root_logger.handlers[:]:
+            try:
+                handler.close()
+            except Exception as e:
+                print(f"Error closing handler: {e}")
+        
+        # Close audit logger handlers
+        audit_logger = logging.getLogger("audit")
+        for handler in audit_logger.handlers[:]:
+            try:
+                handler.close()
+            except Exception as e:
+                print(f"Error closing audit handler: {e}")
+        
+        self.is_initialized = False
+
+
+# Global logger manager instance
+_logger_manager = DorisLoggerManager()
+
+
+def setup_logging(level: str = "INFO",
+                 log_dir: str = "logs",
+                 enable_console: bool = True,
+                 enable_file: bool = True,
+                 enable_audit: bool = True,
+                 audit_file: Optional[str] = None,
+                 max_file_size: int = 10*1024*1024,
+                 backup_count: int = 5,
+                 enable_cleanup: bool = True,
+                 max_age_days: int = 30,
+                 cleanup_interval_hours: int = 24) -> None:
+    """
+    Setup logging configuration (convenience function).
+    
+    Args:
+        level: Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)
+        log_dir: Directory for log files
+        enable_console: Enable console output
+        enable_file: Enable file logging
+        enable_audit: Enable audit logging
+        audit_file: Custom audit log file path
+        max_file_size: Maximum size per log file (bytes)
+        backup_count: Number of backup files to keep
+        enable_cleanup: Enable automatic log cleanup
+        max_age_days: Maximum age of log files in days (default: 30)
+        cleanup_interval_hours: Cleanup interval in hours (default: 24)
+    """
+    _logger_manager.setup_logging(
+        level=level,
+        log_dir=log_dir,
+        enable_console=enable_console,
+        enable_file=enable_file,
+        enable_audit=enable_audit,
+        audit_file=audit_file,
+        max_file_size=max_file_size,
+        backup_count=backup_count,
+        enable_cleanup=enable_cleanup,
+        max_age_days=max_age_days,
+        cleanup_interval_hours=cleanup_interval_hours
+    )
 
 
 def get_logger(name: str) -> logging.Logger:
     """
     Get a logger instance.
-
+    
     Args:
-        name: Logger name
-
+        name: Logger name (usually __name__)
+        
     Returns:
-        Logger instance
+        Configured logger instance
     """
-    return logging.getLogger(name)
+    return _logger_manager.get_logger(name)
+
+
+def get_audit_logger() -> logging.Logger:
+    """Get the audit logger"""
+    return _logger_manager.get_audit_logger()
+
+
+def log_system_info():
+    """Log system information for debugging"""
+    _logger_manager.log_system_info()
+
+
+def get_cleanup_stats() -> dict:
+    """Get log cleanup statistics"""
+    return _logger_manager.get_cleanup_stats()
+
+
+def manual_cleanup() -> dict:
+    """Manually trigger log cleanup and return statistics"""
+    return _logger_manager.manual_cleanup()
+
+
+def shutdown_logging():
+    """Shutdown logging system"""
+    _logger_manager.shutdown()
+
+
+# Compatibility function for existing code
+def setup_logging_old(level: str = "INFO",
+                     log_file: str | None = None,
+                     log_format: str | None = None) -> None:
+    """
+    Legacy setup function for backward compatibility.
+    
+    Args:
+        level: Logging level (DEBUG, INFO, WARNING, ERROR)
+        log_file: Optional log file path (deprecated - use log_dir instead)
+        log_format: Optional custom log format (deprecated)
+    """
+    # Extract directory from log_file if provided
+    log_dir = "logs"
+    if log_file:
+        log_dir = str(Path(log_file).parent)
+    
+    setup_logging(
+        level=level,
+        log_dir=log_dir,
+        enable_console=True,
+        enable_file=True,
+        enable_audit=True
+    )

doris_mcp_server/utils/query_executor.py

@@ -34,6 +34,7 @@ from typing import Any, Dict
 from decimal import Decimal
 
 from .db import DorisConnectionManager, QueryResult
+from .logger import get_logger
 
 
 @dataclass
@@ -92,7 +93,7 @@ class QueryCache:
         self.max_size = max_size
         self.default_ttl = default_ttl
         self.cache: dict[str, CachedQuery] = {}
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
 
     def _generate_cache_key(
         self, sql: str, parameters: dict[str, Any] | None = None
@@ -194,7 +195,7 @@ class QueryOptimizer:
 
     def __init__(self, config):
         self.config = config
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
         self.optimization_rules = self._load_optimization_rules()
 
     def _load_optimization_rules(self) -> list[dict[str, Any]]:
@@ -318,7 +319,7 @@ class DorisQueryExecutor:
     def __init__(self, connection_manager: DorisConnectionManager, config=None):
         self.connection_manager = connection_manager
         self.config = config or self._create_default_config()
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
 
         # Initialize components
         cache_config = getattr(self.config, 'performance', None)
@@ -746,7 +747,7 @@ class QueryPerformanceMonitor:
 
     def __init__(self, query_executor: DorisQueryExecutor):
         self.query_executor = query_executor
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
         self.performance_records = []
 
     async def record_query_performance(

doris_mcp_server/utils/schema_extractor.py

@@ -31,7 +31,7 @@ from dotenv import load_dotenv
 from datetime import datetime, timedelta
 
 # Import unified logging configuration
-from doris_mcp_server.utils.logger import get_logger
+from .logger import get_logger
 
 # Configure logging
 logger = get_logger(__name__)

doris_mcp_server/utils/security.py

@@ -31,6 +31,8 @@ import sqlparse
 from sqlparse.sql import Statement
 from sqlparse.tokens import Keyword, Name
 
+from .logger import get_logger
+
 
 class SecurityLevel(Enum):
     """Security level enumeration"""
@@ -86,7 +88,7 @@ class DorisSecurityManager:
 
     def __init__(self, config):
         self.config = config
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
 
         # Initialize security components
         self.auth_provider = AuthenticationProvider(config)
@@ -211,7 +213,7 @@ class AuthenticationProvider:
 
     def __init__(self, config):
         self.config = config
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
         self.session_cache = {}
 
     async def authenticate(self, auth_info: dict[str, Any]) -> AuthContext:
@@ -321,7 +323,7 @@ class AuthorizationProvider:
 
     def __init__(self, config):
         self.config = config
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
         self.permission_cache = {}
         
         # Load sensitive tables configuration
@@ -464,7 +466,7 @@ class SQLSecurityValidator:
 
     def __init__(self, config):
         self.config = config
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
         
         # Handle DorisConfig object or dictionary configuration
         if hasattr(config, 'get'):
@@ -686,7 +688,7 @@ class DataMaskingProcessor:
 
     def __init__(self, config):
         self.config = config
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger(__name__)
         self.masking_algorithms = self._init_masking_algorithms()
         self.masking_rules = self._load_masking_rules()