diff --git a/omniadvisor/compile.py b/omniadvisor/compile.py index 361624defdfa864694253d4b2b2c1710d0647fa0..fdea3742d274b577da98dd9314c7987b4e582a94 100644 --- a/omniadvisor/compile.py +++ b/omniadvisor/compile.py @@ -82,6 +82,9 @@ def set_permissions(root_dir: dir): config_dir_list = [ f'{root_dir}/config', ] + migrations_dir_list = [ + f'{root_dir}/src/server/app/migrations', + ] for root, _, files in os.walk(root_dir): # 判断是否配置目录 @@ -90,6 +93,12 @@ def set_permissions(root_dir: dir): for file in files: file_path = os.path.join(root, file) os.chmod(file_path, 0o640) + # 判断是否为特殊目录(Django Migrations) + elif root in migrations_dir_list: + os.chmod(root, 0o750) + for file in files: + file_path = os.path.join(root, file) + os.chmod(file_path, 0o550) # 非配置目录,则为程序目录 else: os.chmod(root, 0o550) diff --git a/omniadvisor/script/auto_deploy.sh b/omniadvisor/script/auto_deploy.sh index e15d0677cb9f3a682fed23b78f6ee19da11c6f97..e71ce2100e06f6db98a0a610f42ff1bb638441f7 100644 --- a/omniadvisor/script/auto_deploy.sh +++ b/omniadvisor/script/auto_deploy.sh @@ -57,8 +57,8 @@ cp -r $core_dir/config/* $frame_dir/config/ log INFO "执行命令:mkdir -p $frame_dir/kmc_env && cp -r $core_dir/kmc_env/ $frame_dir/ 合并kmc模块" mkdir -p $frame_dir/kmc_env && cp -r $core_dir/kmc_env/ $frame_dir/ -log INFO "修改$frame_dir/kmc_env的目录权限为550" -chmod 550 "$(readlink -e -- "$frame_dir/kmc_env")" +log INFO "修改$frame_dir/kmc_env的目录权限为750" +chmod 750 "$(readlink -e -- "$frame_dir/kmc_env")" # 修改spark_submit_modified的文件权限 用readlink获取真实路径防止提权 spark_submit_modified=$frame_dir/script/spark-submit diff --git a/omniadvisor/src/common/kmc_toolkit/log.py b/omniadvisor/src/common/kmc_toolkit/log.py index 510e75e246ec2d5e727083920bfd178617af7415..543d25fe0764abfd5f81e9d9ab54d5a20a8e9571 100644 --- a/omniadvisor/src/common/kmc_toolkit/log.py +++ b/omniadvisor/src/common/kmc_toolkit/log.py @@ -13,8 +13,6 @@ from logging.handlers import RotatingFileHandler base_path = os.path.dirname(__file__) LOG_PATH = os.path.join(base_path, r"log") -if not os.path.exists(LOG_PATH): - os.makedirs(LOG_PATH) class Logger(object):