From 48d98005738214925921e6c77d4844aa76b8e4f3 Mon Sep 17 00:00:00 2001
From: yangdx <yangdx@znipower.com>
Date: Sat, 1 Mar 2025 12:58:52 +0800
Subject: [PATCH] Enhance gunicorn config handling with env vars and command
 line arg priority
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Add env var support for timeout/keepalive
• Prioritize CLI args over env vars
• Standardize default timeout to 150s
---
 gunicorn_config.py   |  4 ++--
 run_with_gunicorn.py | 34 ++++++++++++++++++++--------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/gunicorn_config.py b/gunicorn_config.py
index a13054e3..3f5d5db2 100644
--- a/gunicorn_config.py
+++ b/gunicorn_config.py
@@ -26,8 +26,8 @@ preload_app = True
 worker_class = "uvicorn.workers.UvicornWorker"
 
 # Other Gunicorn configurations
-timeout = int(os.getenv("TIMEOUT", 120))
-keepalive = 5
+timeout = int(os.getenv("TIMEOUT", 150))  # Default 150s to match run_with_gunicorn.py
+keepalive = int(os.getenv("KEEPALIVE", 5))  # Default 5s
 
 # Logging configuration
 errorlog = os.getenv("ERROR_LOG", log_file_path)  # Default write to lightrag.log
diff --git a/run_with_gunicorn.py b/run_with_gunicorn.py
index a7692085..6aa2b0f3 100755
--- a/run_with_gunicorn.py
+++ b/run_with_gunicorn.py
@@ -96,21 +96,27 @@ def main():
             # Import and configure the gunicorn_config module
             import gunicorn_config
 
-            # Set configuration variables in gunicorn_config
-            gunicorn_config.workers = int(os.getenv("WORKERS", args.workers))
-            gunicorn_config.bind = (
-                f"{os.getenv('HOST', args.host)}:{os.getenv('PORT', args.port)}"
-            )
-            gunicorn_config.loglevel = (
-                args.log_level.lower()
-                if args.log_level
-                else os.getenv("LOG_LEVEL", "info")
-            )
+            # 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")
 
-            # Set SSL configuration if enabled
-            if args.ssl:
-                gunicorn_config.certfile = args.ssl_certfile
-                gunicorn_config.keyfile = args.ssl_keyfile
+            # 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):