log: route task/component status output through logging, not print()

AttributeChange (the common base of every ATask and component ABC) now
sets self.log = logging.getLogger(type(self).__name__), so components
no longer need to hand-type their own name into each message. Wired
logging.basicConfig() in server/brewpi.py with a bare "%(name)s:
%(message)s" formatter - Tee (see prior commit) still supplies the
"<date>T<time>:" prefix, so lines read "<date>T<time>:<component>:
<message>" without double-stamping, and third-party loggers
(websockets, asyncio) now get the same formatting for free.

Converted the print() call sites that were standing in for this in
tasks/ and components/ (leaving __main__ demo blocks and explicit
debug-dump helpers alone).
This commit is contained in:
2026-07-10 22:00:04 +02:00
parent 6c746c8964
commit a1864a5257
12 changed files with 64 additions and 45 deletions
+3 -3
View File
@@ -45,7 +45,7 @@ class HeaterHendi(AHeater):
# tick loop (with self.device.open(): activate(True)/(False)) and
# from a client's Connect/Disconnect command, neither of which
# expect activate() itself to ever raise.
print(f"HeaterHendi: comm error in activate({enable}): {e}")
self.log.error(f"comm error in activate({enable}): {e}")
self.disconnect()
def is_activated(self):
@@ -55,7 +55,7 @@ class HeaterHendi(AHeater):
s = self.hendi.isRemoteEnable()
return '1' in s
except Exception as e:
print(f"HeaterHendi: comm error in is_activated: {e}")
self.log.error(f"comm error in is_activated: {e}")
self.disconnect()
return False
@@ -72,7 +72,7 @@ class HeaterHendi(AHeater):
self.hendi.setPowerWatts(power)
self.power_eff = self.hendi.getPowerWatts() if power > 0 else 0
except Exception as e:
print(f"HeaterHendi: comm error in process: {e}")
self.log.error(f"comm error in process: {e}")
self.disconnect()
self.power_eff = 0
+8 -6
View File
@@ -1,5 +1,6 @@
#!/usr/bin/python3
import logging
import time
import serial
import sys
@@ -11,6 +12,7 @@ class HendiException(Exception):
class HendiCtrl:
def __init__(self, port, speed, debug=False):
self.log = logging.getLogger(type(self).__name__)
self.debug = debug
self.prompt = b':'
self.sw_id = None
@@ -48,7 +50,7 @@ class HendiCtrl:
try:
self.ser.open()
except serial.SerialException as e:
print(f"HendiCtrl: connect failed: {e}")
self.log.error(f"connect failed: {e}")
return False
# The port itself is what "connected" means - a failed version query
# (e.g. the device sitting in its ungraceful-disconnect lockout, see
@@ -57,9 +59,9 @@ class HendiCtrl:
try:
self.sw_id = self.getSoftwareIdentifier()
self.sw_ver = self.getSoftwareVersion()
print(f"{self.sw_id}, F/W-Version: {self.sw_ver}")
self.log.info(f"{self.sw_id}, F/W-Version: {self.sw_ver}")
except HendiException:
print("HendiCtrl: Hendi not found")
self.log.warning("Hendi not found")
return True
@contextmanager
@@ -91,7 +93,7 @@ class HendiCtrl:
self.ser.rts = True
def firmware_update(self, filename):
print("Start firmware update")
self.log.info("Start firmware update")
self.enter_bootloader()
self.ser.readline()
@@ -122,7 +124,7 @@ class HendiCtrl:
self.ser.flushInput()
data = s.encode()
if self.debug:
print(f"HendiCtrl: -> {data!r}")
self.log.debug(f"-> {data!r}")
self.ser.write(data + b'\r')
def __read(self):
@@ -132,7 +134,7 @@ class HendiCtrl:
# Read answer line
answer_raw = self.ser.readline()
if self.debug:
print(f"HendiCtrl: <- echo={echo!r} answer={answer_raw!r}")
self.log.debug(f"<- echo={echo!r} answer={answer_raw!r}")
answer = answer_raw.decode('utf-8').replace('\r', '').replace('\n', '')
if ':' in answer:
result = answer.split(':')
+6 -4
View File
@@ -1,3 +1,4 @@
import logging
import time
import serial
import enum
@@ -68,6 +69,7 @@ class StatusError(enum.IntFlag):
class Pololu1376:
def __init__(self, serial_port):
self.log = logging.getLogger(type(self).__name__)
# Deferred-open pyserial idiom: serial_port is constructed with no
# port set (see components/actor/stirrerpololu1376.py), so it isn't
# actually opened until connect() is called - a missing/unplugged
@@ -88,7 +90,7 @@ class Pololu1376:
self.ser.close()
self.ser.open()
except serial.SerialException as e:
print(f"Pololu1376: connect failed: {e}")
self.log.error(f"connect failed: {e}")
return False
# set_output_flow_control() requires the port to already be open -
# can only happen here, after open() above, not at construction time.
@@ -96,10 +98,10 @@ class Pololu1376:
try:
self.stop()
self.firmware_version = self.get_firmware_version()
print("Pololu1376 F/W-Version:", self.firmware_version)
self.log.info("F/W-Version: {}".format(self.firmware_version))
return True
except Exception as e:
print(f"Pololu1376: connect failed: {e}")
self.log.error(f"connect failed: {e}")
self.ser.close()
self.firmware_version = None
return False
@@ -142,7 +144,7 @@ class Pololu1376:
rsp = self.cmd("GO")
errors = self.get_status_errors()
if errors:
print(f"Pololu1376: ERROR - still in fail-safe after GO, active errors: {errors!r}")
self.log.error(f"still in fail-safe after GO, active errors: {errors!r}")
return rsp
def stop(self):
+7 -7
View File
@@ -46,7 +46,7 @@ class StirrerPololu1376(AStirrer):
if not self.connected:
return
try:
print("activate {}".format(enable))
self.log.debug("activate {}".format(enable))
if enable:
self.drv.go()
else:
@@ -58,7 +58,7 @@ class StirrerPololu1376(AStirrer):
# loop (with self.device.open(): activate(True)/(False)) and
# from a client's Connect/Disconnect command, neither of which
# expect activate() itself to ever raise.
print(f"StirrerPololu1376: comm error in activate({enable}): {e}")
self.log.error(f"comm error in activate({enable}): {e}")
self.disconnect()
def _on_set_speed(self, speed):
@@ -66,9 +66,9 @@ class StirrerPololu1376(AStirrer):
return
try:
self.drv.motor_forward(speed)
print("Set speed to {} %".format(speed))
self.log.debug("Set speed to {} %".format(speed))
except Exception as e:
print(f"StirrerPololu1376: comm error in _on_set_speed: {e}")
self.log.error(f"comm error in _on_set_speed: {e}")
self.disconnect()
def _on_process(self):
@@ -77,12 +77,12 @@ class StirrerPololu1376(AStirrer):
try:
errors = self.drv.get_status_errors()
if errors:
print(f"StirrerPololu1376: motor controller reports errors: {errors!r}")
self.log.warning(f"motor controller reports errors: {errors!r}")
if StatusError.SAFE_START_VIOLATION in errors:
print("Recover after safe start violation!")
self.log.warning("Recover after safe start violation!")
self.drv.go()
except Exception as e:
print(f"StirrerPololu1376: comm error in _on_process: {e}")
self.log.error(f"comm error in _on_process: {e}")
self.disconnect()