Skip to content

Commit ff0b90e

Browse files
committed
updates to logging hierarchy
1 parent d4123c8 commit ff0b90e

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

src/torchrunx/agent.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,11 @@ def main(
4949
"""
5050
# Setup logging & stream logs to server
5151

52-
logger = logging.getLogger(f"{__package__}.{hostname}")
53-
5452
log_records_to_socket(
5553
hostname=hostname, local_rank=None, logger_hostname=logger_hostname, logger_port=logger_port
5654
)
5755

56+
logger = logging.getLogger()
5857
redirect_stdio_to_logger(logger)
5958

6059
logger.debug("Initializing launcher-agent group.")

src/torchrunx/utils/logs.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,19 @@ def handle(self) -> None:
169169
while len(chunk) < slen:
170170
chunk = chunk + self.connection.recv(slen - len(chunk))
171171
obj = pickle.loads(chunk)
172-
record = logging.makeLogRecord(obj)
172+
173+
## Transform log record
174+
175+
record: WorkerLogRecord = logging.makeLogRecord(obj) # pyright: ignore [reportAssignmentType]
176+
177+
if record.name != "root":
178+
record.msg = f"{record.name}:{record.msg}"
179+
180+
record.name = f"torchrunx.{record.hostname}"
181+
if record.local_rank is not None:
182+
record.name += f".{record.local_rank}"
183+
184+
## Handle log record
173185

174186
for handler in handlers:
175187
handler.handle(record)

src/torchrunx/worker.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,14 @@ def worker_entrypoint(serialized_worker_args: bytes) -> Any | ExceptionFromWorke
5959

6060
# Start logging to the logging server (i.e. the launcher)
6161

62-
logger = logging.getLogger(f"{__package__}.{worker_args.hostname}.{worker_args.local_rank}")
63-
6462
log_records_to_socket(
6563
hostname=worker_args.hostname,
6664
local_rank=worker_args.local_rank,
6765
logger_hostname=worker_args.logger_hostname,
6866
logger_port=worker_args.logger_port,
6967
)
7068

69+
logger = logging.getLogger()
7170
redirect_stdio_to_logger(logger)
7271

7372
# Set rank/world environment variables

0 commit comments

Comments
 (0)