From 07d5f3c0ab897cbd7b0f10805f2acfb1443c1530 Mon Sep 17 00:00:00 2001 From: ZZY <2450266535@qq.com> Date: Sat, 26 Apr 2025 17:43:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(main):=20=E6=B7=BB=E5=8A=A0=20Docker=20?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E9=AA=8C=E8=AF=81=E5=B9=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=20nginx=20=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 main.py 中添加 Docker 网络验证功能,如果未创建所需网络,记录错误信息 - 更新 nginx.py 中 logger 模块的导入路径,使用相对路径导入 --- main.py | 3 +++ src/nginx.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 38f1b56..31d3222 100644 --- a/main.py +++ b/main.py @@ -139,6 +139,9 @@ def main(): # 配置生成 try: + if not validate_docker_network(): + logger.error("请先创建Docker网络,否则nginx将会失效: docker network create %s", NETWORK_NAME) + inner, outter = parse_yaml_config(Path(args.input)) # 根据类型选择配置 diff --git a/src/nginx.py b/src/nginx.py index b021414..35ea6fe 100644 --- a/src/nginx.py +++ b/src/nginx.py @@ -8,7 +8,7 @@ from pathlib import Path import shutil import subprocess -from logger import get_logger +from src.logger import get_logger logger = get_logger(__name__) NGINX_CONF_DIR = Path("nginx/conf/conf.d")