Skip to content

Commit e9c1aef

Browse files
committed
Get rid of the TRACE log level and just use DEBUG
1 parent 234b1f2 commit e9c1aef

File tree

6 files changed

+13
-61
lines changed

6 files changed

+13
-61
lines changed

tests/test_utils.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

zigpy_znp/__init__.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
import logging
2-
3-
from .utils import TraceLogger
4-
5-
if not hasattr(logging.getLoggerClass(), "trace"):
6-
logging.setLoggerClass(TraceLogger)
7-
8-
91
MAJOR_VERSION = 0
102
MINOR_VERSION = 0
113
PATCH_VERSION = 9

zigpy_znp/api.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,17 +206,17 @@ def close(self) -> None:
206206
self._cancel_all_listeners()
207207

208208
def _remove_listener(self, listener: BaseResponseListener) -> None:
209-
LOGGER.trace("Removing listener %s", listener)
209+
LOGGER.debug("Removing listener %s", listener)
210210

211211
for header in listener.matching_headers():
212212
self._response_listeners[header].remove(listener)
213213

214214
if not self._response_listeners[header]:
215-
LOGGER.trace("Cleaning up empty listener list for header %s", header)
215+
LOGGER.debug("Cleaning up empty listener list for header %s", header)
216216
del self._response_listeners[header]
217217

218218
total_listeners = sum(map(len, self._response_listeners.values()))
219-
LOGGER.trace("There are %d listeners remaining", total_listeners)
219+
LOGGER.debug("There are %d listeners remaining", total_listeners)
220220

221221
def frame_received(self, frame: GeneralFrame) -> None:
222222
"""
@@ -233,19 +233,19 @@ def frame_received(self, frame: GeneralFrame) -> None:
233233

234234
for listener in self._response_listeners[command.header]:
235235
if not listener.resolve(command):
236-
LOGGER.trace("%s does not match %s", command, listener)
236+
LOGGER.debug("%s does not match %s", command, listener)
237237
continue
238238

239239
matched = True
240-
LOGGER.trace("%s matches %s", command, listener)
240+
LOGGER.debug("%s matches %s", command, listener)
241241

242242
if not matched:
243243
LOGGER.warning("Received an unhandled command: %s", command)
244244

245245
def callback_for_responses(self, responses, callback) -> None:
246246
listener = CallbackResponseListener(responses, callback=callback)
247247

248-
LOGGER.trace("Creating callback %s", listener)
248+
LOGGER.debug("Creating callback %s", listener)
249249

250250
for header in listener.matching_headers():
251251
self._response_listeners[header].append(listener)
@@ -256,7 +256,7 @@ def callback_for_response(self, response, callback) -> None:
256256
def wait_for_responses(self, responses) -> asyncio.Future:
257257
listener = OneShotResponseListener(responses)
258258

259-
LOGGER.trace("Creating one-shot listener %s", listener)
259+
LOGGER.debug("Creating one-shot listener %s", listener)
260260

261261
for header in listener.matching_headers():
262262
self._response_listeners[header].append(listener)
@@ -296,7 +296,7 @@ async def request(self, request, **response_params):
296296

297297
# If our request has no response, we cannot wait for one
298298
if not request.Rsp:
299-
LOGGER.trace("Request has no response, not waiting for one.")
299+
LOGGER.debug("Request has no response, not waiting for one.")
300300
self._uart.send(request.to_frame())
301301
return
302302

zigpy_znp/uart.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ def data_received(self, data: bytes) -> None:
6363
"""Callback when data is received."""
6464
self._buffer += data
6565

66-
LOGGER.trace("Received data: %s", Bytes.__repr__(data))
66+
LOGGER.debug("Received data: %s", Bytes.__repr__(data))
6767

6868
for frame in self._extract_frames():
69-
LOGGER.trace("Parsed frame: %s", frame)
69+
LOGGER.debug("Parsed frame: %s", frame)
7070

7171
try:
7272
self._api.frame_received(frame.payload)
@@ -80,7 +80,7 @@ def send(self, payload: frames.GeneralFrame) -> None:
8080
self._transport_write(frames.TransportFrame(payload).serialize())
8181

8282
def _transport_write(self, data: bytes) -> None:
83-
LOGGER.trace("Sending data: %s", Bytes.__repr__(data))
83+
LOGGER.debug("Sending data: %s", Bytes.__repr__(data))
8484
self.transport.write(data)
8585

8686
def _extract_frames(self) -> typing.Iterator[frames.TransportFrame]:

zigpy_znp/utils.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

zigpy_znp/zigbee/application.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def _receive_zdo_message(
159159
zdo_args = [t(zdo_kwargs[n]) for n, t in zip(field_names, field_types)]
160160
message = t.serialize_list([t.uint8_t(tsn)] + zdo_args)
161161

162-
LOGGER.trace("Pretending we received a ZDO message: %s", message)
162+
LOGGER.debug("Pretending we received a ZDO message: %s", message)
163163
self.handle_message(
164164
sender=sender,
165165
profile=zigpy.profiles.zha.PROFILE_ID,
@@ -575,7 +575,7 @@ async def _send_zdo_request(
575575
This method translates the ZDO_* MT response into one zigpy can handle.
576576
"""
577577

578-
LOGGER.trace(
578+
LOGGER.debug(
579579
"Intercepted a ZDO request: dst_addr=%s, dst_ep=%s, src_ep=%s, "
580580
"cluster=%s, sequence=%s, options=%s, radius=%s, data=%s",
581581
dst_addr,

0 commit comments

Comments
 (0)