Refactor logging setup and simplify Gunicorn configuration
• Move logging setup code to utils.py • Provide setup_logger for standalone LightRAG logger intialization
This commit is contained in:
@@ -2,12 +2,15 @@
|
|||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
from lightrag.kg.shared_storage import finalize_share_data
|
from lightrag.kg.shared_storage import finalize_share_data
|
||||||
from lightrag.api.lightrag_server import LightragPathFilter
|
from lightrag.utils import setup_logger
|
||||||
|
|
||||||
# Get log directory path from environment variable
|
# Get log directory path from environment variable
|
||||||
log_dir = os.getenv("LOG_DIR", os.getcwd())
|
log_dir = os.getenv("LOG_DIR", os.getcwd())
|
||||||
log_file_path = os.path.abspath(os.path.join(log_dir, "lightrag.log"))
|
log_file_path = os.path.abspath(os.path.join(log_dir, "lightrag.log"))
|
||||||
|
|
||||||
|
# Ensure log directory exists
|
||||||
|
os.makedirs(os.path.dirname(log_file_path), exist_ok=True)
|
||||||
|
|
||||||
# Get log file max size and backup count from environment variables
|
# Get log file max size and backup count from environment variables
|
||||||
log_max_bytes = int(os.getenv("LOG_MAX_BYTES", 10485760)) # Default 10MB
|
log_max_bytes = int(os.getenv("LOG_MAX_BYTES", 10485760)) # Default 10MB
|
||||||
log_backup_count = int(os.getenv("LOG_BACKUP_COUNT", 5)) # Default 5 backups
|
log_backup_count = int(os.getenv("LOG_BACKUP_COUNT", 5)) # Default 5 backups
|
||||||
@@ -108,6 +111,9 @@ def on_starting(server):
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
print("psutil not installed, skipping memory usage reporting")
|
print("psutil not installed, skipping memory usage reporting")
|
||||||
|
|
||||||
|
# Log the location of the LightRAG log file
|
||||||
|
print(f"LightRAG log file: {log_file_path}\n")
|
||||||
|
|
||||||
print("Gunicorn initialization complete, forking workers...\n")
|
print("Gunicorn initialization complete, forking workers...\n")
|
||||||
|
|
||||||
|
|
||||||
@@ -134,51 +140,18 @@ def post_fork(server, worker):
|
|||||||
Executed after a worker has been forked.
|
Executed after a worker has been forked.
|
||||||
This is a good place to set up worker-specific configurations.
|
This is a good place to set up worker-specific configurations.
|
||||||
"""
|
"""
|
||||||
# Configure formatters
|
|
||||||
detailed_formatter = logging.Formatter(
|
|
||||||
"%(asctime)s - %(name)s - %(levelname)s - %(message)s"
|
|
||||||
)
|
|
||||||
simple_formatter = logging.Formatter("%(levelname)s: %(message)s")
|
|
||||||
|
|
||||||
def setup_logger(logger_name: str, level: str = "INFO", add_filter: bool = False):
|
|
||||||
"""Set up a logger with console and file handlers"""
|
|
||||||
logger_instance = logging.getLogger(logger_name)
|
|
||||||
logger_instance.setLevel(level)
|
|
||||||
logger_instance.handlers = [] # Clear existing handlers
|
|
||||||
logger_instance.propagate = False
|
|
||||||
|
|
||||||
# Add console handler
|
|
||||||
console_handler = logging.StreamHandler()
|
|
||||||
console_handler.setFormatter(simple_formatter)
|
|
||||||
console_handler.setLevel(level)
|
|
||||||
logger_instance.addHandler(console_handler)
|
|
||||||
|
|
||||||
# Add file handler
|
|
||||||
file_handler = logging.handlers.RotatingFileHandler(
|
|
||||||
filename=log_file_path,
|
|
||||||
maxBytes=log_max_bytes,
|
|
||||||
backupCount=log_backup_count,
|
|
||||||
encoding="utf-8",
|
|
||||||
)
|
|
||||||
file_handler.setFormatter(detailed_formatter)
|
|
||||||
file_handler.setLevel(level)
|
|
||||||
logger_instance.addHandler(file_handler)
|
|
||||||
|
|
||||||
# Add path filter if requested
|
|
||||||
if add_filter:
|
|
||||||
path_filter = LightragPathFilter()
|
|
||||||
logger_instance.addFilter(path_filter)
|
|
||||||
|
|
||||||
# Set up main loggers
|
# Set up main loggers
|
||||||
log_level = loglevel.upper() if loglevel else "INFO"
|
log_level = loglevel.upper() if loglevel else "INFO"
|
||||||
setup_logger("uvicorn", log_level)
|
setup_logger("uvicorn", log_level, add_filter=False, log_file_path=log_file_path)
|
||||||
setup_logger("uvicorn.access", log_level, add_filter=True)
|
setup_logger(
|
||||||
setup_logger("lightrag", log_level, add_filter=True)
|
"uvicorn.access", log_level, add_filter=True, log_file_path=log_file_path
|
||||||
|
)
|
||||||
|
setup_logger("lightrag", log_level, add_filter=True, log_file_path=log_file_path)
|
||||||
|
|
||||||
# Set up lightrag submodule loggers
|
# Set up lightrag submodule loggers
|
||||||
for name in logging.root.manager.loggerDict:
|
for name in logging.root.manager.loggerDict:
|
||||||
if name.startswith("lightrag."):
|
if name.startswith("lightrag."):
|
||||||
setup_logger(name, log_level, add_filter=True)
|
setup_logger(name, log_level, add_filter=True, log_file_path=log_file_path)
|
||||||
|
|
||||||
# Disable uvicorn.error logger
|
# Disable uvicorn.error logger
|
||||||
uvicorn_error_logger = logging.getLogger("uvicorn.error")
|
uvicorn_error_logger = logging.getLogger("uvicorn.error")
|
||||||
|
@@ -437,6 +437,9 @@ def configure_logging():
|
|||||||
log_dir = os.getenv("LOG_DIR", os.getcwd())
|
log_dir = os.getenv("LOG_DIR", os.getcwd())
|
||||||
log_file_path = os.path.abspath(os.path.join(log_dir, "lightrag.log"))
|
log_file_path = os.path.abspath(os.path.join(log_dir, "lightrag.log"))
|
||||||
|
|
||||||
|
print(f"\nLightRAG log file: {log_file_path}\n")
|
||||||
|
os.makedirs(os.path.dirname(log_dir), exist_ok=True)
|
||||||
|
|
||||||
# Get log file max size and backup count from environment variables
|
# Get log file max size and backup count from environment variables
|
||||||
log_max_bytes = int(os.getenv("LOG_MAX_BYTES", 10485760)) # Default 10MB
|
log_max_bytes = int(os.getenv("LOG_MAX_BYTES", 10485760)) # Default 10MB
|
||||||
log_backup_count = int(os.getenv("LOG_BACKUP_COUNT", 5)) # Default 5 backups
|
log_backup_count = int(os.getenv("LOG_BACKUP_COUNT", 5)) # Default 5 backups
|
||||||
|
@@ -266,9 +266,6 @@ class LightRAG:
|
|||||||
_storages_status: StoragesStatus = field(default=StoragesStatus.NOT_CREATED)
|
_storages_status: StoragesStatus = field(default=StoragesStatus.NOT_CREATED)
|
||||||
|
|
||||||
def __post_init__(self):
|
def __post_init__(self):
|
||||||
os.makedirs(os.path.dirname(self.log_file_path), exist_ok=True)
|
|
||||||
logger.info(f"Logger initialized for working directory: {self.working_dir}")
|
|
||||||
|
|
||||||
from lightrag.kg.shared_storage import (
|
from lightrag.kg.shared_storage import (
|
||||||
initialize_share_data,
|
initialize_share_data,
|
||||||
)
|
)
|
||||||
|
@@ -6,6 +6,7 @@ import io
|
|||||||
import csv
|
import csv
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
|
import logging.handlers
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
@@ -68,6 +69,101 @@ logger.setLevel(logging.INFO)
|
|||||||
logging.getLogger("httpx").setLevel(logging.WARNING)
|
logging.getLogger("httpx").setLevel(logging.WARNING)
|
||||||
|
|
||||||
|
|
||||||
|
class LightragPathFilter(logging.Filter):
|
||||||
|
"""Filter for lightrag logger to filter out frequent path access logs"""
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
super().__init__()
|
||||||
|
# Define paths to be filtered
|
||||||
|
self.filtered_paths = ["/documents", "/health", "/webui/"]
|
||||||
|
|
||||||
|
def filter(self, record):
|
||||||
|
try:
|
||||||
|
# Check if record has the required attributes for an access log
|
||||||
|
if not hasattr(record, "args") or not isinstance(record.args, tuple):
|
||||||
|
return True
|
||||||
|
if len(record.args) < 5:
|
||||||
|
return True
|
||||||
|
|
||||||
|
# Extract method, path and status from the record args
|
||||||
|
method = record.args[1]
|
||||||
|
path = record.args[2]
|
||||||
|
status = record.args[4]
|
||||||
|
|
||||||
|
# Filter out successful GET requests to filtered paths
|
||||||
|
if (
|
||||||
|
method == "GET"
|
||||||
|
and (status == 200 or status == 304)
|
||||||
|
and path in self.filtered_paths
|
||||||
|
):
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
except Exception:
|
||||||
|
# In case of any error, let the message through
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def setup_logger(
|
||||||
|
logger_name: str,
|
||||||
|
level: str = "INFO",
|
||||||
|
add_filter: bool = False,
|
||||||
|
log_file_path: str = None,
|
||||||
|
):
|
||||||
|
"""Set up a logger with console and file handlers
|
||||||
|
|
||||||
|
Args:
|
||||||
|
logger_name: Name of the logger to set up
|
||||||
|
level: Log level (DEBUG, INFO, WARNING, ERROR, CRITICAL)
|
||||||
|
add_filter: Whether to add LightragPathFilter to the logger
|
||||||
|
log_file_path: Path to the log file. If None, will use current directory/lightrag.log
|
||||||
|
"""
|
||||||
|
# Configure formatters
|
||||||
|
detailed_formatter = logging.Formatter(
|
||||||
|
"%(asctime)s - %(name)s - %(levelname)s - %(message)s"
|
||||||
|
)
|
||||||
|
simple_formatter = logging.Formatter("%(levelname)s: %(message)s")
|
||||||
|
|
||||||
|
# Get log file path
|
||||||
|
if log_file_path is None:
|
||||||
|
log_dir = os.getenv("LOG_DIR", os.getcwd())
|
||||||
|
log_file_path = os.path.abspath(os.path.join(log_dir, "lightrag.log"))
|
||||||
|
|
||||||
|
# Ensure log directory exists
|
||||||
|
os.makedirs(os.path.dirname(log_file_path), exist_ok=True)
|
||||||
|
|
||||||
|
# Get log file max size and backup count from environment variables
|
||||||
|
log_max_bytes = int(os.getenv("LOG_MAX_BYTES", 10485760)) # Default 10MB
|
||||||
|
log_backup_count = int(os.getenv("LOG_BACKUP_COUNT", 5)) # Default 5 backups
|
||||||
|
|
||||||
|
logger_instance = logging.getLogger(logger_name)
|
||||||
|
logger_instance.setLevel(level)
|
||||||
|
logger_instance.handlers = [] # Clear existing handlers
|
||||||
|
logger_instance.propagate = False
|
||||||
|
|
||||||
|
# Add console handler
|
||||||
|
console_handler = logging.StreamHandler()
|
||||||
|
console_handler.setFormatter(simple_formatter)
|
||||||
|
console_handler.setLevel(level)
|
||||||
|
logger_instance.addHandler(console_handler)
|
||||||
|
|
||||||
|
# Add file handler
|
||||||
|
file_handler = logging.handlers.RotatingFileHandler(
|
||||||
|
filename=log_file_path,
|
||||||
|
maxBytes=log_max_bytes,
|
||||||
|
backupCount=log_backup_count,
|
||||||
|
encoding="utf-8",
|
||||||
|
)
|
||||||
|
file_handler.setFormatter(detailed_formatter)
|
||||||
|
file_handler.setLevel(level)
|
||||||
|
logger_instance.addHandler(file_handler)
|
||||||
|
|
||||||
|
# Add path filter if requested
|
||||||
|
if add_filter:
|
||||||
|
path_filter = LightragPathFilter()
|
||||||
|
logger_instance.addFilter(path_filter)
|
||||||
|
|
||||||
|
|
||||||
class UnlimitedSemaphore:
|
class UnlimitedSemaphore:
|
||||||
"""A context manager that allows unlimited access."""
|
"""A context manager that allows unlimited access."""
|
||||||
|
|
||||||
|
@@ -1,203 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
"""
|
|
||||||
Start LightRAG server with Gunicorn
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import signal
|
|
||||||
import pipmaster as pm
|
|
||||||
from lightrag.api.utils_api import parse_args, display_splash_screen
|
|
||||||
from lightrag.kg.shared_storage import initialize_share_data, finalize_share_data
|
|
||||||
|
|
||||||
|
|
||||||
def check_and_install_dependencies():
|
|
||||||
"""Check and install required dependencies"""
|
|
||||||
required_packages = [
|
|
||||||
"gunicorn",
|
|
||||||
"tiktoken",
|
|
||||||
"psutil",
|
|
||||||
# Add other required packages here
|
|
||||||
]
|
|
||||||
|
|
||||||
for package in required_packages:
|
|
||||||
if not pm.is_installed(package):
|
|
||||||
print(f"Installing {package}...")
|
|
||||||
pm.install(package)
|
|
||||||
print(f"{package} installed successfully")
|
|
||||||
|
|
||||||
|
|
||||||
# Signal handler for graceful shutdown
|
|
||||||
def signal_handler(sig, frame):
|
|
||||||
print("\n\n" + "=" * 80)
|
|
||||||
print("RECEIVED TERMINATION SIGNAL")
|
|
||||||
print(f"Process ID: {os.getpid()}")
|
|
||||||
print("=" * 80 + "\n")
|
|
||||||
|
|
||||||
# Release shared resources
|
|
||||||
finalize_share_data()
|
|
||||||
|
|
||||||
# Exit with success status
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
# Check and install dependencies
|
|
||||||
check_and_install_dependencies()
|
|
||||||
|
|
||||||
# Register signal handlers for graceful shutdown
|
|
||||||
signal.signal(signal.SIGINT, signal_handler) # Ctrl+C
|
|
||||||
signal.signal(signal.SIGTERM, signal_handler) # kill command
|
|
||||||
|
|
||||||
# Parse all arguments using parse_args
|
|
||||||
args = parse_args(is_uvicorn_mode=False)
|
|
||||||
|
|
||||||
# Display startup information
|
|
||||||
display_splash_screen(args)
|
|
||||||
|
|
||||||
print("🚀 Starting LightRAG with Gunicorn")
|
|
||||||
print(f"🔄 Worker management: Gunicorn (workers={args.workers})")
|
|
||||||
print("🔍 Preloading app: Enabled")
|
|
||||||
print("📝 Note: Using Gunicorn's preload feature for shared data initialization")
|
|
||||||
print("\n\n" + "=" * 80)
|
|
||||||
print("MAIN PROCESS INITIALIZATION")
|
|
||||||
print(f"Process ID: {os.getpid()}")
|
|
||||||
print(f"Workers setting: {args.workers}")
|
|
||||||
print("=" * 80 + "\n")
|
|
||||||
|
|
||||||
# Import Gunicorn's StandaloneApplication
|
|
||||||
from gunicorn.app.base import BaseApplication
|
|
||||||
|
|
||||||
# Define a custom application class that loads our config
|
|
||||||
class GunicornApp(BaseApplication):
|
|
||||||
def __init__(self, app, options=None):
|
|
||||||
self.options = options or {}
|
|
||||||
self.application = app
|
|
||||||
super().__init__()
|
|
||||||
|
|
||||||
def load_config(self):
|
|
||||||
# Define valid Gunicorn configuration options
|
|
||||||
valid_options = {
|
|
||||||
"bind",
|
|
||||||
"workers",
|
|
||||||
"worker_class",
|
|
||||||
"timeout",
|
|
||||||
"keepalive",
|
|
||||||
"preload_app",
|
|
||||||
"errorlog",
|
|
||||||
"accesslog",
|
|
||||||
"loglevel",
|
|
||||||
"certfile",
|
|
||||||
"keyfile",
|
|
||||||
"limit_request_line",
|
|
||||||
"limit_request_fields",
|
|
||||||
"limit_request_field_size",
|
|
||||||
"graceful_timeout",
|
|
||||||
"max_requests",
|
|
||||||
"max_requests_jitter",
|
|
||||||
}
|
|
||||||
|
|
||||||
# Special hooks that need to be set separately
|
|
||||||
special_hooks = {
|
|
||||||
"on_starting",
|
|
||||||
"on_reload",
|
|
||||||
"on_exit",
|
|
||||||
"pre_fork",
|
|
||||||
"post_fork",
|
|
||||||
"pre_exec",
|
|
||||||
"pre_request",
|
|
||||||
"post_request",
|
|
||||||
"worker_init",
|
|
||||||
"worker_exit",
|
|
||||||
"nworkers_changed",
|
|
||||||
"child_exit",
|
|
||||||
}
|
|
||||||
|
|
||||||
# Import and configure the gunicorn_config module
|
|
||||||
import gunicorn_config
|
|
||||||
|
|
||||||
# Set configuration variables in gunicorn_config, prioritizing command line arguments
|
|
||||||
gunicorn_config.workers = (
|
|
||||||
args.workers if args.workers else int(os.getenv("WORKERS", 1))
|
|
||||||
)
|
|
||||||
|
|
||||||
# Bind configuration prioritizes command line arguments
|
|
||||||
host = args.host if args.host != "0.0.0.0" else os.getenv("HOST", "0.0.0.0")
|
|
||||||
port = args.port if args.port != 9621 else int(os.getenv("PORT", 9621))
|
|
||||||
gunicorn_config.bind = f"{host}:{port}"
|
|
||||||
|
|
||||||
# Log level configuration prioritizes command line arguments
|
|
||||||
gunicorn_config.loglevel = (
|
|
||||||
args.log_level.lower()
|
|
||||||
if args.log_level
|
|
||||||
else os.getenv("LOG_LEVEL", "info")
|
|
||||||
)
|
|
||||||
|
|
||||||
# Timeout configuration prioritizes command line arguments
|
|
||||||
gunicorn_config.timeout = (
|
|
||||||
args.timeout if args.timeout else int(os.getenv("TIMEOUT", 150))
|
|
||||||
)
|
|
||||||
|
|
||||||
# Keepalive configuration
|
|
||||||
gunicorn_config.keepalive = int(os.getenv("KEEPALIVE", 5))
|
|
||||||
|
|
||||||
# SSL configuration prioritizes command line arguments
|
|
||||||
if args.ssl or os.getenv("SSL", "").lower() in (
|
|
||||||
"true",
|
|
||||||
"1",
|
|
||||||
"yes",
|
|
||||||
"t",
|
|
||||||
"on",
|
|
||||||
):
|
|
||||||
gunicorn_config.certfile = (
|
|
||||||
args.ssl_certfile
|
|
||||||
if args.ssl_certfile
|
|
||||||
else os.getenv("SSL_CERTFILE")
|
|
||||||
)
|
|
||||||
gunicorn_config.keyfile = (
|
|
||||||
args.ssl_keyfile if args.ssl_keyfile else os.getenv("SSL_KEYFILE")
|
|
||||||
)
|
|
||||||
|
|
||||||
# Set configuration options from the module
|
|
||||||
for key in dir(gunicorn_config):
|
|
||||||
if key in valid_options:
|
|
||||||
value = getattr(gunicorn_config, key)
|
|
||||||
# Skip functions like on_starting and None values
|
|
||||||
if not callable(value) and value is not None:
|
|
||||||
self.cfg.set(key, value)
|
|
||||||
# Set special hooks
|
|
||||||
elif key in special_hooks:
|
|
||||||
value = getattr(gunicorn_config, key)
|
|
||||||
if callable(value):
|
|
||||||
self.cfg.set(key, value)
|
|
||||||
|
|
||||||
if hasattr(gunicorn_config, "logconfig_dict"):
|
|
||||||
self.cfg.set(
|
|
||||||
"logconfig_dict", getattr(gunicorn_config, "logconfig_dict")
|
|
||||||
)
|
|
||||||
|
|
||||||
def load(self):
|
|
||||||
# Import the application
|
|
||||||
from lightrag.api.lightrag_server import get_application
|
|
||||||
|
|
||||||
return get_application(args)
|
|
||||||
|
|
||||||
# Create the application
|
|
||||||
app = GunicornApp("")
|
|
||||||
|
|
||||||
# Force workers to be an integer and greater than 1 for multi-process mode
|
|
||||||
workers_count = int(args.workers)
|
|
||||||
if workers_count > 1:
|
|
||||||
# Set a flag to indicate we're in the main process
|
|
||||||
os.environ["LIGHTRAG_MAIN_PROCESS"] = "1"
|
|
||||||
initialize_share_data(workers_count)
|
|
||||||
else:
|
|
||||||
initialize_share_data(1)
|
|
||||||
|
|
||||||
# Run the application
|
|
||||||
print("\nStarting Gunicorn with direct Python API...")
|
|
||||||
app.run()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
Reference in New Issue
Block a user