Skip to content

Commit 1aa4312

Browse files
committed
Fine tune some logging (2)
1 parent 8d0c681 commit 1aa4312

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

hardware/relay/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@ def __get_hardware_value(self):
166166
data = func_timeout(self._UPDATE_TIME_OUT, self._get_hardware_value)
167167

168168
except FunctionTimedOut:
169-
raise terrariumRelayUpdateException(f"{error_message}: Timed out after {self._UPDATE_TIME_OUT} seconds.")
169+
raise terrariumRelayUpdateException(f"{error_message}: Timed out after {self._UPDATE_TIME_OUT} seconds")
170170
except Exception as ex:
171-
raise terrariumRelayUpdateException(f"{error_message}: {ex}.")
171+
raise terrariumRelayUpdateException(f"{error_message}: {ex}")
172172

173173
if data is None:
174-
raise terrariumRelayUpdateException(f"{error_message}: no data.")
174+
raise terrariumRelayUpdateException(f"{error_message}: no data")
175175

176176
return data
177177

hardware/sensor/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,14 +296,14 @@ def get_data(self):
296296
data = func_timeout(self._UPDATE_TIME_OUT, self._get_data)
297297

298298
except FunctionTimedOut:
299-
raise terrariumSensorUpdateException(f"{error_message}: Timed out after {self._UPDATE_TIME_OUT} seconds.")
299+
raise terrariumSensorUpdateException(f"{error_message}: Timed out after {self._UPDATE_TIME_OUT} seconds")
300300
except Exception as ex:
301-
raise terrariumSensorUpdateException(f"{error_message}: {ex}.")
301+
raise terrariumSensorUpdateException(f"{error_message}: {ex}")
302302
finally:
303303
self.__power_management(False)
304304

305305
if data is None:
306-
raise terrariumSensorUpdateException(f"{error_message}: no data.")
306+
raise terrariumSensorUpdateException(f"{error_message}: no data")
307307

308308
return data
309309

terrariumArea.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def __repr__(self):
9292
Returns:
9393
string: Area with area type
9494
"""
95-
return f'{terrariumArea.__TYPES[self.type]["name"]} named {self.name}'
95+
return f'{terrariumArea.__TYPES[self.type]["name"]} named \'{self.name}\''
9696

9797
@property
9898
def _powered(self):
@@ -877,7 +877,7 @@ def update(self, read_only=False):
877877
self.state["last_update"] = int(datetime.datetime.now().timestamp())
878878

879879
logger.info(
880-
f"Updated area {self} in {self.mode} mode at enclosure {self.enclosure.name} in {time.time()-start:.2f} seconds."
880+
f"Updated area {self} in '{self.mode}' mode at enclosure {self.enclosure.name} in {time.time()-start:.2f} seconds."
881881
)
882882
return self.state
883883

0 commit comments

Comments
 (0)