diff --git a/executor/python_executor/executor.py b/executor/python_executor/executor.py index bf0d39dc..087faa1c 100644 --- a/executor/python_executor/executor.py +++ b/executor/python_executor/executor.py @@ -17,11 +17,11 @@ logger = logging.getLogger(EXECUTOR_NAME) service_store: dict[str, Literal["launching", "running"]] = {} -# 日志目录 ~/.oocana/executor/{session_id}/[python-{suffix}.log | python.log] +# 日志目录 ~/.oocana/sessions/{session_id}/[python-{suffix}.log | python.log] def config_logger(session_id: str, suffix: str | None, output: Literal["console", "file"]): if output == "file": - executor_dir = os.path.join(oocana_dir(), "executor", session_id) + executor_dir = os.path.join(oocana_dir(), "sessions", session_id) logger_file = os.path.join(executor_dir, f"python-{suffix}.log") if suffix is not None else os.path.join(executor_dir, "python.log") if not os.path.exists(logger_file): diff --git a/executor/python_executor/service.py b/executor/python_executor/service.py index 188f4463..86065d20 100644 --- a/executor/python_executor/service.py +++ b/executor/python_executor/service.py @@ -14,11 +14,11 @@ DEFAULT_BLOCK_ALIVE_TIME = 10 # 两种文件,根据是否有 session id 来区分: -# 1. 跨 session service(global service): ~/.oocana/services/{service_hash}.log -# 2. session service: ~/.oocana/executor/{session_id}/{service_hash}.log +# 1. session service: ~/.oocana/sessions/{session_id}/python-{service_hash}.log +# 2. 跨 session service(global service): ~/.oocana/services/python-{service_hash}.log def config_logger(service_hash: str, session_id: str | None): import os.path - logger_file = os.path.join(oocana_dir(), "services", service_hash + ".log") if session_id is None else os.path.join(oocana_dir(), "executor", session_id, service_hash + ".log") + logger_file = os.path.join(oocana_dir(), "services", "python-" + service_hash + ".log") if session_id is None else os.path.join(oocana_dir(), "sessions", session_id, "python-" + service_hash + ".log") if not os.path.exists(logger_file): os.makedirs(os.path.dirname(logger_file), exist_ok=True)