Skip to content

refactor: move log location #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leavesster merged 1 commit into from
Dec 23, 2024
Merged

refactor: move log location #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions executor/python_executor/executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
6 changes: 3 additions & 3 deletions executor/python_executor/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading