Skip to content
This repository has been archived by the owner on May 30, 2020. It is now read-only.

Commit

Permalink
Do not call logger.xyz with already formatted strings
Browse files Browse the repository at this point in the history
  • Loading branch information
@ercpe
ercpe committed Jan 30, 2016
1 parent 114d4da commit 8eb5959
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
20 changes: 10 additions & 10 deletions src/pymax/cube.py
View file
Expand Up @@ -107,7 +107,7 @@ def connect(self):
if self._socket:
raise CubeConnectionException("Already connected")

logger.info("Connecting to cube %s:%s" % self.addr_port)
logger.info("Connecting to cube %s:%s", *self.addr_port)
self._socket = self._create_socket()
self.read()

Expand All @@ -130,16 +130,16 @@ def read(self):

while more:
try:
logger.debug("socket.recv(%s)" % buffer_size)
logger.debug("socket.recv(%s)", buffer_size)
tmp = self.socket.recv(buffer_size)
logger.debug("Read %s bytes" % len(tmp))
logger.debug("Read %s bytes", len(tmp))
more = len(tmp) > 0
buffer += tmp
except socket.timeout:
break

messages = buffer.splitlines()
logger.debug("Processing %s messages" % len(messages))
logger.debug("Processing %s messages", len(messages))

while len(messages):
current = messages[0]
Expand All @@ -153,10 +153,10 @@ def read(self):
while len(messages) > 1 and chr(messages[1][0]) == message_type:
multi_responses.append(messages.pop(1)[2:])

logger.debug("'%s' message with %s parts" % (message_type, len(multi_responses)))
logger.debug("'%s' message with %s parts", message_type, len(multi_responses))
response = self.parse_message(message_type, multi_responses)
else:
logger.debug("'%s' single-part message" % message_type)
logger.debug("'%s' single-part message", message_type)
response = self.parse_message(message_type, current[2:])

self.handle_message(response)
Expand All @@ -178,15 +178,15 @@ def parse_message(self, message_type, buffer):

if clazz:
response = clazz(buffer)
logger.info("Received message %s: %s" % (type(response).__name__, response))
logger.info("Received message %s: %s", type(response).__name__, response)
self.received_messages[message_type] = response
return response
else:
logger.warning("Cannot process message type %s" % message_type)
logger.warning("Cannot process message type %s", message_type)
return None

def handle_message(self, msg):
logger.info("Handle message: %s" % msg)
logger.info("Handle message: %s", msg)
if isinstance(msg, HelloResponse):
self._cube_info = msg
elif isinstance(msg, FResponse):
Expand All @@ -201,7 +201,7 @@ def handle_message(self, msg):

def send_message(self, msg):
message_bytes = msg.to_bytes()
logger.info("Sending '%s' message (%s bytes)" % (msg.__class__.__name__, len(message_bytes)))
logger.info("Sending '%s' message (%s bytes)", msg.__class__.__name__, len(message_bytes))
self.socket.send(message_bytes)
self.read()

Expand Down
32 changes: 16 additions & 16 deletions src/pymax/response.py
View file
Expand Up @@ -191,7 +191,7 @@ def _parse(self):
room_id, name_length = struct.unpack('bb', data[pos:pos+2])
room_name = data[pos + 2:pos + 2 + name_length].decode('utf-8')
group_rf_address = RFAddr(data[pos+name_length + 2 : pos+name_length + 2 + 3])
logger.debug("Room ID: %s, Room Name: %s, Group RF address: %s" % (room_id, room_name, group_rf_address))
logger.debug("Room ID: %s, Room Name: %s, Group RF address: %s", room_id, room_name, group_rf_address)
self.rooms.append((room_id, room_name, group_rf_address))
# set pos to start of next section
pos += 1 + 1 + name_length + 3
Expand All @@ -209,7 +209,7 @@ def _parse(self):
device_name = data[pos+15:pos+15+device_name_length].decode('utf-8')
room_id = data[pos+15+device_name_length]

logger.debug("Device: %s, Device RF address: %s, Device serial: %s, Device: %s, Room: %s" % (device_idx, device_rf_address, device_serial, device_name, room_id))
logger.debug("Device: %s, Device RF address: %s, Device serial: %s, Device: %s, Room: %s", device_idx, device_rf_address, device_serial, device_name, room_id)
self.devices.append((device_idx, device_type, device_rf_address, device_serial, device_name, room_id))

pos += 1 + 3 + 10 + device_name_length + 2
Expand All @@ -228,22 +228,22 @@ def _parse(self):
#self.dump_bytes(data, "device config")

data_length = data[0]
logger.debug("Data length for device config: %s" % data_length)
logger.debug("Data length for device config: %s", data_length)

self.device_addr = RFAddr(data[1:4])
self.device_type, self.room_id, self.firmware_version, self.test_result = struct.unpack('bbbb', data[4:8])
self.serial_number = data[8:17].decode('utf-8')

logger.debug("Device config for %s: type: %s, room: %s, firmware: %s, test: %s, serial number: %s" % (
logger.debug("Device config for %s: type: %s, room: %s, firmware: %s, test: %s, serial number: %s",
self.device_addr, self.device_type, self.room_id, self.firmware_version, self.test_result, self.serial_number
))
)

if self.device_type == DeviceCube:
self._parse_cube_config(data[18:])
elif self.device_type == DeviceRadiatorThermostat or self.device_type == DeviceRadiatorThermostatPlus:
self._parse_thermostat_config(data[18:])
else:
logger.warning("Cannot parse device configuration for type %s (%s)" % (self.device_type, device_type_name(self.device_type)))
logger.warning("Cannot parse device configuration for type %s (%s)", self.device_type, device_type_name(self.device_type))

def _parse_cube_config(self, config):
# Position Length Information
Expand Down Expand Up @@ -316,16 +316,16 @@ def _parse_thermostat_config(self, config):

ConfigurationResponse.max_valve_setting = property(lambda x: x.max_valve_raw * 100 / 255)

logger.debug("Comfort temperature: %s°C (raw: %s)" % (self.comfort_temperature, self.comfort_temperature_raw))
logger.debug("Eco temperature: %s°C (raw: %s)" % (self.eco_temperature, self.eco_temperature_raw))
logger.debug("Max set point temperature: %s°C (raw: %s)" % (self.max_set_point_temperature, self.max_set_point_temperature_raw))
logger.debug("Min set point temperature: %s°C (raw: %s)" % (self.min_set_point_temperature, self.min_set_point_temperature_raw))
logger.debug("Temperature offset: %s°C (raw: %s)" % (self.temperature_offset, self.temperature_offset_raw))
logger.debug("Window open temperature: %s°C (raw: %s)" % (self.window_open_temperature, self.window_open_temperature_raw))
logger.debug("Window open duration: %s min (raw: %s)" % (self.window_open_duration, self.window_open_duration_raw))
logger.debug("Boost: %s minutes, %s %%" % (self.boost_duration, self.boost_valve_setting))
logger.debug("Decalcification: day %s, hour %s" % (self.decalcification_day, self.decalcification_hour))
logger.debug("Max valve setting: %s%% (raw: %s)" % (self.max_valve_setting, self.max_valve_raw))
logger.debug("Comfort temperature: %s°C (raw: %s)", self.comfort_temperature, self.comfort_temperature_raw)
logger.debug("Eco temperature: %s°C (raw: %s)", self.eco_temperature, self.eco_temperature_raw)
logger.debug("Max set point temperature: %s°C (raw: %s)", self.max_set_point_temperature, self.max_set_point_temperature_raw)
logger.debug("Min set point temperature: %s°C (raw: %s)", self.min_set_point_temperature, self.min_set_point_temperature_raw)
logger.debug("Temperature offset: %s°C (raw: %s)", self.temperature_offset, self.temperature_offset_raw)
logger.debug("Window open temperature: %s°C (raw: %s)", self.window_open_temperature, self.window_open_temperature_raw)
logger.debug("Window open duration: %s min (raw: %s)", self.window_open_duration, self.window_open_duration_raw)
logger.debug("Boost: %s minutes, %s %%", self.boost_duration, self.boost_valve_setting)
logger.debug("Decalcification: day %s, hour %s", self.decalcification_day, self.decalcification_hour)
logger.debug("Max valve setting: %s%% (raw: %s)", self.max_valve_setting, self.max_valve_raw)
self.week_program = self._parse_week_program(config[11:])

def _parse_week_program(self, buffer):
Expand Down
2 changes: 1 addition & 1 deletion src/pymax/util.py
View file
Expand Up @@ -14,7 +14,7 @@ def dump_bytes(self, barray, message=None, level=logging.DEBUG):
return

if isinstance(barray, bytearray):
logger.log(level, "%s (%s bytes)" % (message or 'Data', len(barray)))
logger.log(level, "%s (%s bytes)", (message or 'Data'), len(barray))
for row_num in range(0, len(barray), 10):
row_bytes = barray[row_num:row_num+10]
logger.log(level, "%s %s" % (str(row_num).ljust(2), ' '.join(["%02x" % x for x in row_bytes])))
Expand Down

0 comments on commit 8eb5959

Please sign in to comment.