From c1c5ffd14eab50681ffbcff81bd1160c326fc247 Mon Sep 17 00:00:00 2001 From: Xingyao Wang Date: Mon, 16 Dec 2024 14:00:32 -0500 Subject: [PATCH] revert oh changes --- openhands/core/logger.py | 13 +++++++++++++ openhands/runtime/utils/log_streamer.py | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/openhands/core/logger.py b/openhands/core/logger.py index 07c799d7ff901..96af739b695db 100644 --- a/openhands/core/logger.py +++ b/openhands/core/logger.py @@ -12,6 +12,7 @@ LOG_LEVEL = os.getenv('LOG_LEVEL', 'INFO').upper() DEBUG = os.getenv('DEBUG', 'False').lower() in ['true', '1', 'yes'] +DEBUG_RUNTIME = os.getenv('DEBUG_RUNTIME', 'False').lower() in ['true', '1', 'yes'] if DEBUG: LOG_LEVEL = 'DEBUG' @@ -353,3 +354,15 @@ def _setup_llm_logger(name: str, log_level: int): llm_prompt_logger = _setup_llm_logger('prompt', current_log_level) llm_response_logger = _setup_llm_logger('response', current_log_level) + +# Runtime logger - only enabled when DEBUG_RUNTIME=true +runtime_logger = logging.getLogger('runtime') +runtime_logger.propagate = False +runtime_logger.setLevel(current_log_level) +runtime_logger.addHandler(get_console_handler(current_log_level)) +if LOG_TO_FILE: + runtime_logger.addHandler( + get_file_handler(os.path.join(LOG_DIR, 'runtime'), current_log_level) + ) +if not DEBUG_RUNTIME: + runtime_logger.disabled = True diff --git a/openhands/runtime/utils/log_streamer.py b/openhands/runtime/utils/log_streamer.py index 24a28b93f36cc..0681ae245bdc9 100644 --- a/openhands/runtime/utils/log_streamer.py +++ b/openhands/runtime/utils/log_streamer.py @@ -3,6 +3,8 @@ import docker +from openhands.core.logger import runtime_logger + class LogStreamer: """Streams Docker container logs to stdout. @@ -33,9 +35,9 @@ def _stream_logs(self): break if log_line: decoded_line = log_line.decode('utf-8').rstrip() - self.log('debug', f'[inside container] {decoded_line}') + runtime_logger.debug(f'[inside container] {decoded_line}') except Exception as e: - self.log('error', f'Error streaming docker logs to stdout: {e}') + runtime_logger.error(f'Error streaming docker logs to stdout: {e}') def __del__(self): if self.stdout_thread and self.stdout_thread.is_alive():