From b27ca9b5716f6ffc2b66ccff5e3cfa7878143664 Mon Sep 17 00:00:00 2001 From: Nicole Jung <31713368+purplenicole730@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:07:10 -0400 Subject: [PATCH] RSDK-7933 fix logging bugs (#668) --- src/viam/logging.py | 2 +- src/viam/robot/client.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/viam/logging.py b/src/viam/logging.py index 5d33aca62..b61d8efd0 100644 --- a/src/viam/logging.py +++ b/src/viam/logging.py @@ -43,7 +43,7 @@ def handle_task_result(self, task: asyncio.Task): def emit(self, record: logging.LogRecord): assert isinstance(record, logging.LogRecord) name = record.name.split(".")[-1] - message = f"{record.filename}:{record.lineno}\t{record.msg}" + message = f"{record.filename}:{record.lineno}\t{record.getMessage()}" stack = f"exc_info: {record.exc_info}, exc_text: {record.exc_text}, stack_info: {record.stack_info}" time = datetime.fromtimestamp(record.created) diff --git a/src/viam/robot/client.py b/src/viam/robot/client.py index ee8bac79f..cf30c2466 100644 --- a/src/viam/robot/client.py +++ b/src/viam/robot/client.py @@ -793,7 +793,7 @@ async def stop_all(self, extra: Dict[ResourceName, Dict[str, Any]] = {}): # LOG # ####### - async def log(self, name: str, level: str, time: datetime, log: str, stack: str): + async def log(self, name: str, level: str, time: datetime, message: str, stack: str): """Send log from Python module over gRPC. Create a LogEntry object from the log to send to RDK. @@ -802,12 +802,12 @@ async def log(self, name: str, level: str, time: datetime, log: str, stack: str) name (str): The logger's name. level (str): The level of the log. time (datetime): The log creation time. - log (str): The log message. + message (str): The log message. stack (str): The stack information of the log. For more information, see `Machine Management API `_. """ - entry = LogEntry(level=level, time=datetime_to_timestamp(time), logger_name=name, message=log, stack=stack) + entry = LogEntry(level=level, time=datetime_to_timestamp(time), logger_name=name, message=message, stack=stack) request = LogRequest(logs=[entry]) await self._client.Log(request)