d

domainCheck/app/config.py

@@ -34,14 +34,56 @@ else:
     # 开发环境目录
     BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-# 加载环境变量
-env_path = os.path.join(BASE_DIR, '.env')
-if os.path.exists(env_path):
-    load_dotenv(env_path)
-    _safe_echo(f"成功加载环境变量文件: {env_path}")
-else:
+
+def _detect_install_root(base_dir):
+    normalized = os.path.abspath(str(base_dir or ""))
+    marker = f"{os.sep}releases{os.sep}"
+    if marker in normalized:
+        return normalized.split(marker, 1)[0]
+    return ""
+
+
+def _resolve_runtime_root(base_dir):
+    explicit_root = str(os.getenv('DOMAINCHECK_RUNTIME_ROOT', '') or '').strip()
+    if explicit_root:
+        return os.path.abspath(explicit_root)
+    install_root = _detect_install_root(base_dir)
+    if install_root:
+        return os.path.join(install_root, 'runtime', 'domainCheck')
+    return os.path.abspath(base_dir)
+
+
+def _load_environment(base_dir):
+    install_root = _detect_install_root(base_dir)
+    runtime_root = _resolve_runtime_root(base_dir)
+    candidate_paths = [
+        str(os.getenv('DOMAINCHECK_ENV_FILE', '') or '').strip(),
+        os.path.join(base_dir, '.env'),
+        os.path.join(runtime_root, '.env'),
+        os.path.join(os.getcwd(), '.env'),
+    ]
+    if install_root:
+        candidate_paths.append(os.path.join(install_root, 'domainCheck', '.env'))
+
+    seen = set()
+    for path in candidate_paths:
+        normalized = os.path.abspath(path) if path else ''
+        if not normalized or normalized in seen:
+            continue
+        seen.add(normalized)
+        if os.path.exists(normalized):
+            load_dotenv(normalized)
+            _safe_echo(f"成功加载环境变量文件: {normalized}")
+            return normalized
+
     load_dotenv()
-    _safe_echo(f"环境变量文件不存在: {env_path}，使用默认环境变量")
+    fallback_path = os.path.join(base_dir, '.env')
+    _safe_echo(f"环境变量文件不存在: {fallback_path}，使用默认环境变量")
+    return ""
+
+# 加载环境变量
+env_path = _load_environment(BASE_DIR)
+RUNTIME_ROOT = _resolve_runtime_root(BASE_DIR)
 
 
 class Config:
@@ -55,7 +97,11 @@ class Config:
     DB_DATABASE = os.getenv('DB_DATABASE', 'domain_scan_db')
     DB_USER = os.getenv('DB_USER', 'postgres')
     DB_PASSWORD = os.getenv('DB_PASSWORD', 'postgres')
-    DB_POOL_SIZE = int(os.getenv('DB_POOL_SIZE', 5))
+    DB_POOL_SIZE = int(os.getenv('DB_POOL_SIZE', 64))
+    DB_POOL_WARM_SIZE = int(os.getenv('DB_POOL_WARM_SIZE', 8))
+    DB_POOL_IDLE_KEEP_MAX = int(os.getenv('DB_POOL_IDLE_KEEP_MAX', DB_POOL_SIZE))
+    DB_POOL_HEALTHCHECK_INTERVAL = float(os.getenv('DB_POOL_HEALTHCHECK_INTERVAL', 30))
+    DB_POOL_ACQUIRE_TIMEOUT = float(os.getenv('DB_POOL_ACQUIRE_TIMEOUT', 20))
     
     # 消息队列配置
     RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'localhost')
@@ -86,12 +132,14 @@ class Config:
     DETECT_TIMEOUT = int(os.getenv('DETECT_TIMEOUT', 30))
     DETECT_RETRY_COUNT = int(os.getenv('DETECT_RETRY_COUNT', 3))
     DETECT_CONCURRENCY = int(os.getenv('DETECT_CONCURRENCY', 10))
-    WAYBACK_CDX_TIMEOUT = int(os.getenv('WAYBACK_CDX_TIMEOUT', 15))
-    WAYBACK_SNAPSHOT_TIMEOUT = int(os.getenv('WAYBACK_SNAPSHOT_TIMEOUT', 12))
-    WAYBACK_RETRY_COUNT = int(os.getenv('WAYBACK_RETRY_COUNT', 2))
+    WAYBACK_CDX_TIMEOUT = int(os.getenv('WAYBACK_CDX_TIMEOUT', 2))
+    WAYBACK_SNAPSHOT_TIMEOUT = int(os.getenv('WAYBACK_SNAPSHOT_TIMEOUT', 2))
+    WAYBACK_RETRY_COUNT = int(os.getenv('WAYBACK_RETRY_COUNT', 0))
     WAYBACK_REQUEST_DELAY = float(os.getenv('WAYBACK_REQUEST_DELAY', 0))
     WAYBACK_PROGRESS_INTERVAL = int(os.getenv('WAYBACK_PROGRESS_INTERVAL', 500))
-    WAYBACK_DOMAIN_CONCURRENCY = int(os.getenv('WAYBACK_DOMAIN_CONCURRENCY', 3))
+    WAYBACK_DOMAIN_CONCURRENCY = int(os.getenv('WAYBACK_DOMAIN_CONCURRENCY', 2))
+    WAYBACK_MAX_RECORDS = int(os.getenv('WAYBACK_MAX_RECORDS', 4))
+    WAYBACK_TRANSIENT_BACKOFF_SECONDS = float(os.getenv('WAYBACK_TRANSIENT_BACKOFF_SECONDS', 8))
     WAYBACK_TITLE_MAX_BYTES = int(os.getenv('WAYBACK_TITLE_MAX_BYTES', 65536))
     WAYBACK_TIMESTAMP_CACHE_TTL = int(os.getenv('WAYBACK_TIMESTAMP_CACHE_TTL', 86400))
     WAYBACK_TITLE_CACHE_TTL = int(os.getenv('WAYBACK_TITLE_CACHE_TTL', 2592000))
@@ -139,8 +187,9 @@ class Config:
     
     # 目录配置
     BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    DATA_DIR = os.path.join(BASE_DIR, 'data')
-    LOG_DIR = os.path.join(BASE_DIR, 'logs')
+    RUNTIME_ROOT = RUNTIME_ROOT
+    DATA_DIR = os.path.join(RUNTIME_ROOT, 'data')
+    LOG_DIR = os.path.join(RUNTIME_ROOT, 'logs')
     
     # 确保目录存在
     os.makedirs(DATA_DIR, exist_ok=True)