Skip to content

Commit 5bf0065

Browse files
authored
Merge pull request #110 from adf-python/fix/logger-type
structlogのインポートを修正し、BoundLoggerの型注釈を修正
2 parents d48cfdd + 2774474 commit 5bf0065

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/adf_core_python/core/gateway/gateway_launcher.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import socket
22

3-
from structlog import BoundLogger
3+
from structlog.stdlib import BoundLogger
44

55
from adf_core_python.core.gateway.gateway_agent import GatewayAgent
66
from adf_core_python.core.launcher.connect.connection import Connection
@@ -32,8 +32,7 @@ def connect(self, gateway_agent: GatewayAgent) -> None:
3232
self.logger.warning(f"Connection to {self.host}:{self.port} timed out")
3333
return
3434
except socket.error as e:
35-
self.logger.error(f"Failed to connect to {self.host}:{self.port}")
36-
self.logger.error(e)
35+
self.logger.error(f"Failed to connect to {self.host}:{self.port} {e}")
3736
return
3837

3938
connection.message_received(gateway_agent.message_received)

src/adf_core_python/core/launcher/connect/component_launcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import socket
22
import time
33

4-
from structlog import BoundLogger
4+
from structlog.stdlib import BoundLogger
55

66
from adf_core_python.core.agent.agent import Agent
77
from adf_core_python.core.launcher.connect.connection import Connection

src/adf_core_python/core/logger/logger.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
import structlog
77
from structlog.dev import ConsoleRenderer
88
from structlog.processors import JSONRenderer
9+
from structlog.stdlib import BoundLogger
910

1011
from adf_core_python.core.agent.info.agent_info import AgentInfo
1112

1213

13-
def get_logger(name: str) -> structlog.BoundLogger:
14+
def get_logger(name: str) -> BoundLogger:
1415
"""
1516
Get a logger with the given name.
1617
For kernel logging, use this function to get a logger.
@@ -22,13 +23,13 @@ def get_logger(name: str) -> structlog.BoundLogger:
2223
2324
Returns
2425
-------
25-
structlog.BoundLogger
26+
BoundLogger
2627
The logger with the given name.
2728
"""
2829
return structlog.get_logger(name)
2930

3031

31-
def get_agent_logger(name: str, agent_info: AgentInfo) -> structlog.BoundLogger:
32+
def get_agent_logger(name: str, agent_info: AgentInfo) -> BoundLogger:
3233
"""
3334
Get a logger with the given name and agent information.
3435
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:
4243
4344
Returns
4445
-------
45-
structlog.BoundLogger
46+
BoundLogger
4647
The logger with the given name and agent information.
4748
"""
4849
agent = agent_info.get_myself()

0 commit comments

Comments
 (0)