Skip to content

Commit 776c78a

Browse files
authored
refactor: replaced root logger use with named ones (#307)
1 parent f3df9be commit 776c78a

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

src/aioswitcher/api/__init__.py

+15-13
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from binascii import unhexlify
1919
from datetime import timedelta
2020
from enum import Enum, unique
21-
from logging import debug, info
21+
from logging import getLogger
2222
from socket import AF_INET
2323
from types import TracebackType
2424
from typing import Optional, Set, Tuple, Type, final
@@ -40,6 +40,8 @@
4040
SwitcherStateResponse,
4141
)
4242

43+
logger = getLogger(__name__)
44+
4345

4446
@unique
4547
class Command(Enum):
@@ -88,24 +90,24 @@ async def __aexit__(
8890

8991
async def connect(self) -> None:
9092
"""Connect to asynchronous socket and get reader and writer object."""
91-
info("connecting to the switcher device")
93+
logger.info("connecting to the switcher device")
9294
self._reader, self._writer = await open_connection(
9395
host=self._ip_address,
9496
port=self._port,
9597
family=AF_INET,
9698
)
9799

98100
self._connected = True
99-
info("switcher device connected")
101+
logger.info("switcher device connected")
100102

101103
async def disconnect(self) -> None:
102104
"""Disconnect from asynchronous socket."""
103105
if hasattr(self, "_writer") and self._writer:
104-
info("disconnecting from the switcher device")
106+
logger.info("disconnecting from the switcher device")
105107
self._writer.close()
106108
await self._writer.wait_closed()
107109
else:
108-
info("switcher device not connected")
110+
logger.info("switcher device not connected")
109111
self._connected = False
110112

111113
@property
@@ -128,7 +130,7 @@ async def _login(self) -> Tuple[str, SwitcherLoginResponse]:
128130
packet = packets.LOGIN_PACKET.format(timestamp)
129131
signed_packet = sign_packet_with_crc_key(packet)
130132

131-
debug("sending a login packet")
133+
logger.debug("sending a login packet")
132134
self._writer.write(unhexlify(signed_packet))
133135
response = await self._reader.read(1024)
134136
return timestamp, SwitcherLoginResponse(response)
@@ -153,7 +155,7 @@ async def _get_full_state(self) -> Tuple[str, str, SwitcherStateResponse]:
153155
)
154156
signed_packet = sign_packet_with_crc_key(packet)
155157

156-
debug("sending a get state packet")
158+
logger.debug("sending a get state packet")
157159
self._writer.write(unhexlify(signed_packet))
158160
state_resp = await self._reader.read(1024)
159161
try:
@@ -202,7 +204,7 @@ async def control_device(
202204
)
203205
signed_packet = sign_packet_with_crc_key(packet)
204206

205-
debug("sending a control packet")
207+
logger.debug("sending a control packet")
206208
self._writer.write(unhexlify(signed_packet))
207209
response = await self._reader.read(1024)
208210
return SwitcherBaseResponse(response)
@@ -228,7 +230,7 @@ async def set_auto_shutdown(self, full_time: timedelta) -> SwitcherBaseResponse:
228230
)
229231
signed_packet = sign_packet_with_crc_key(packet)
230232

231-
debug("sending a set auto shutdown packet")
233+
logger.debug("sending a set auto shutdown packet")
232234
self._writer.write(unhexlify(signed_packet))
233235
response = await self._reader.read(1024)
234236
return SwitcherBaseResponse(response)
@@ -253,7 +255,7 @@ async def set_device_name(self, name: str) -> SwitcherBaseResponse:
253255
)
254256
signed_packet = sign_packet_with_crc_key(packet)
255257

256-
debug("sending a set name packet")
258+
logger.debug("sending a set name packet")
257259
self._writer.write(unhexlify(signed_packet))
258260
response = await self._reader.read(1024)
259261
return SwitcherBaseResponse(response)
@@ -273,7 +275,7 @@ async def get_schedules(self) -> SwitcherGetSchedulesResponse:
273275
)
274276
signed_packet = sign_packet_with_crc_key(packet)
275277

276-
debug("sending a get schedules packet")
278+
logger.debug("sending a get schedules packet")
277279
self._writer.write(unhexlify(signed_packet))
278280
response = await self._reader.read(1024)
279281
return SwitcherGetSchedulesResponse(response)
@@ -296,7 +298,7 @@ async def delete_schedule(self, schedule_id: str) -> SwitcherBaseResponse:
296298
)
297299
signed_packet = sign_packet_with_crc_key(packet)
298300

299-
debug("sending a delete schedule packet")
301+
logger.debug("sending a delete schedule packet")
300302
self._writer.write(unhexlify(signed_packet))
301303
response = await self._reader.read(1024)
302304
return SwitcherBaseResponse(response)
@@ -335,7 +337,7 @@ async def create_schedule(
335337
)
336338
signed_packet = sign_packet_with_crc_key(packet)
337339

338-
debug("sending a create schedule packet")
340+
logger.debug("sending a create schedule packet")
339341
self._writer.write(unhexlify(signed_packet))
340342
response = await self._reader.read(1024)
341343
return SwitcherBaseResponse(response)

src/aioswitcher/bridge.py

+12-11
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from binascii import hexlify
1919
from dataclasses import dataclass
2020
from functools import partial
21-
from logging import critical, debug, error, info
21+
from logging import getLogger
2222
from socket import AF_INET, inet_ntoa
2323
from struct import pack
2424
from types import TracebackType
@@ -36,6 +36,7 @@
3636
from .device.tools import seconds_to_iso_time, watts_to_amps
3737

3838
__all__ = ["SwitcherBridge"]
39+
logger = getLogger(__name__)
3940

4041

4142
def _parse_device_from_datagram(
@@ -52,7 +53,7 @@ def _parse_device_from_datagram(
5253
"""
5354
parser = DatagramParser(datagram)
5455
if not parser.is_switcher_originator():
55-
error("received datagram from an unknown source")
56+
logger.error("received datagram from an unknown source")
5657
else:
5758
device_type = parser.get_device_type()
5859
device_state = parser.get_device_state()
@@ -64,7 +65,7 @@ def _parse_device_from_datagram(
6465
electric_current = 0.0
6566

6667
if device_type and device_type.category == DeviceCategory.WATER_HEATER:
67-
debug("discovered a water heater switcher device")
68+
logger.debug("discovered a water heater switcher device")
6869
device_callback(
6970
SwitcherWaterHeater(
7071
device_type,
@@ -85,7 +86,7 @@ def _parse_device_from_datagram(
8586
)
8687

8788
elif device_type and device_type.category == DeviceCategory.POWER_PLUG:
88-
debug("discovered a power plug switcher device")
89+
logger.debug("discovered a power plug switcher device")
8990
device_callback(
9091
SwitcherPowerPlug(
9192
device_type,
@@ -137,7 +138,7 @@ async def __aexit__(
137138

138139
async def start(self) -> None:
139140
"""Create an asynchronous listener and start the bridge."""
140-
info("starting the udp bridge")
141+
logger.info("starting the udp bridge")
141142
protocol_factory = UdpClientProtocol(
142143
partial(_parse_device_from_datagram, self._on_device)
143144
)
@@ -148,16 +149,16 @@ async def start(self) -> None:
148149
)
149150

150151
self._is_running = True
151-
info("udp bridge started")
152+
logger.info("udp bridge started")
152153
self._transport = transport
153154

154155
async def stop(self) -> None:
155156
"""Stop the asynchronous bridge."""
156157
if self._transport and not self._transport.is_closing():
157-
info("stopping the udp bridge")
158+
logger.info("stopping the udp bridge")
158159
self._transport.close()
159160
else:
160-
info("udp bridge not started")
161+
logger.info("udp bridge not started")
161162
self._is_running = False
162163

163164
@property
@@ -186,16 +187,16 @@ def datagram_received(self, data: bytes, addr: Tuple) -> None:
186187
def error_received(self, exc: Optional[Exception]) -> None:
187188
"""Call on exception received."""
188189
if exc:
189-
error(f"udp client received error {exc}")
190+
logger.error(f"udp client received error {exc}")
190191
else:
191192
warn("udp client received error")
192193

193194
def connection_lost(self, exc: Optional[Exception]) -> None:
194195
"""Call on connection lost."""
195196
if exc:
196-
critical(f"udp bridge lost its connection {exc}")
197+
logger.critical(f"udp bridge lost its connection {exc}")
197198
else:
198-
info("udp connection stopped")
199+
logger.info("udp connection stopped")
199200

200201

201202
@final

0 commit comments

Comments
 (0)