From 27744747880f546e847f3c662ce593782c8b2eff Mon Sep 17 00:00:00 2001 From: shima004 Date: Fri, 8 Aug 2025 13:18:08 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20structlog=E3=81=AE=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97?= =?UTF-8?q?=E3=80=81BoundLogger=E3=81=AE=E5=9E=8B=E6=B3=A8=E9=87=88?= =?UTF-8?q?=E3=82=92=E7=B0=A1=E7=B4=A0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/adf_core_python/core/gateway/gateway_launcher.py | 5 ++--- .../core/launcher/connect/component_launcher.py | 2 +- src/adf_core_python/core/logger/logger.py | 9 +++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/adf_core_python/core/gateway/gateway_launcher.py b/src/adf_core_python/core/gateway/gateway_launcher.py index 47053c60..109b662d 100644 --- a/src/adf_core_python/core/gateway/gateway_launcher.py +++ b/src/adf_core_python/core/gateway/gateway_launcher.py @@ -1,6 +1,6 @@ import socket -from structlog import BoundLogger +from structlog.stdlib import BoundLogger from adf_core_python.core.gateway.gateway_agent import GatewayAgent from adf_core_python.core.launcher.connect.connection import Connection @@ -32,8 +32,7 @@ def connect(self, gateway_agent: GatewayAgent) -> None: self.logger.warning(f"Connection to {self.host}:{self.port} timed out") return except socket.error as e: - self.logger.error(f"Failed to connect to {self.host}:{self.port}") - self.logger.error(e) + self.logger.error(f"Failed to connect to {self.host}:{self.port} {e}") return connection.message_received(gateway_agent.message_received) diff --git a/src/adf_core_python/core/launcher/connect/component_launcher.py b/src/adf_core_python/core/launcher/connect/component_launcher.py index 48903001..6536b447 100644 --- a/src/adf_core_python/core/launcher/connect/component_launcher.py +++ b/src/adf_core_python/core/launcher/connect/component_launcher.py @@ -1,7 +1,7 @@ import socket import time -from structlog import BoundLogger +from structlog.stdlib import BoundLogger from adf_core_python.core.agent.agent import Agent from adf_core_python.core.launcher.connect.connection import Connection diff --git a/src/adf_core_python/core/logger/logger.py b/src/adf_core_python/core/logger/logger.py index 1f9a61dc..2cb3d0c9 100644 --- a/src/adf_core_python/core/logger/logger.py +++ b/src/adf_core_python/core/logger/logger.py @@ -6,11 +6,12 @@ import structlog from structlog.dev import ConsoleRenderer from structlog.processors import JSONRenderer +from structlog.stdlib import BoundLogger from adf_core_python.core.agent.info.agent_info import AgentInfo -def get_logger(name: str) -> structlog.BoundLogger: +def get_logger(name: str) -> BoundLogger: """ Get a logger with the given name. For kernel logging, use this function to get a logger. @@ -22,13 +23,13 @@ def get_logger(name: str) -> structlog.BoundLogger: Returns ------- - structlog.BoundLogger + BoundLogger The logger with the given name. """ return structlog.get_logger(name) -def get_agent_logger(name: str, agent_info: AgentInfo) -> structlog.BoundLogger: +def get_agent_logger(name: str, agent_info: AgentInfo) -> BoundLogger: """ Get a logger with the given name and agent information. For agent logging, use this function to get a logger. @@ -42,7 +43,7 @@ def get_agent_logger(name: str, agent_info: AgentInfo) -> structlog.BoundLogger: Returns ------- - structlog.BoundLogger + BoundLogger The logger with the given name and agent information. """ agent = agent_info.get_myself()