Skip to content

Commit 876bcd2

Browse files
authored
Filter out logging events from debug logs (#766)
* Filter out logging events from debug logs * Add missing conditional * Filter out logging statements from recorded messages too * remove extra commit
1 parent d34483d commit 876bcd2

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

zwave_js_server/client.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,11 @@ async def _receive_json_or_raise(self) -> dict:
459459
except ValueError as err:
460460
raise InvalidMessage("Received invalid JSON.") from err
461461

462-
if LOGGER.isEnabledFor(logging.DEBUG):
462+
if LOGGER.isEnabledFor(logging.DEBUG) and not (
463+
self.server_logging_enabled
464+
and data.get("type") == "event"
465+
and data.get("event", {}).get("event") == "logging"
466+
):
463467
LOGGER.debug("Received message:\n%s\n", pprint.pformat(msg))
464468

465469
return data
@@ -507,7 +511,9 @@ def _handle_incoming_message(self, msg: dict) -> None:
507511
)
508512
return
509513

510-
if self._record_messages:
514+
if self._record_messages and not (
515+
self.server_logging_enabled and msg["event"]["event"] == "logging"
516+
):
511517
self._recorded_events.append(
512518
{
513519
"record_type": "event",

zwave_js_server/model/node/firmware.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def to_dict(self) -> NodeFirmwareUpdateDeviceIDDataType:
265265
return cast(NodeFirmwareUpdateDeviceIDDataType, data)
266266

267267

268-
class NodeFirmwareUpdateInfoDataType(TypedDict):
268+
class NodeFirmwareUpdateInfoDataType(TypedDict, total=False):
269269
"""Represent a firmware update info data dict type."""
270270

271271
version: str

0 commit comments

Comments
 (0)