simpler log, newer base image

pull/106/head
Jeff Culverhouse 12 months ago
parent ec34875f68
commit 92df402331

@ -1,4 +1,4 @@
FROM python:3.9-alpine FROM python:3.14.0a5-alpine3.21
RUN python3 -m ensurepip RUN python3 -m ensurepip

@ -119,29 +119,12 @@ def mqtt_connect():
log(f"Could not connect to MQTT server: {error}", level="ERROR") log(f"Could not connect to MQTT server: {error}", level="ERROR")
sys.exit(1) sys.exit(1)
def on_mqtt_disconnect(client, userdata, rc): def on_mqtt_disconnect(mqtt_client, userdata, flags, rc, properties):
match rc: if rc != 0:
case 0: log(f"MQTT connection failed: {rc}", level="ERROR")
return else:
case 1: log(f"MQTT connection closed successfully", level="INFO")
log(f"MQTT connection refused: protocol level not supported", level="ERROR") exit_gracefully(rc, skip_mqtt=True)
exit_gracefully(rc, skip_mqtt=True)
case 2:
log(f"MQTT connection refused: client-id not allowed", level="ERROR")
exit_gracefully(rc, skip_mqtt=True)
case 3:
log(f"MQTT connection refused: MQTT service not available", level="ERROR")
case 4:
log(f"MQTT connection refused: user or password malformed", level="ERROR")
exit_gracefully(rc, skip_mqtt=True)
case 5:
log(f"MQTT connection refused: not authorized", level="ERROR")
exit_gracefully(rc, skip_mqtt=True)
case _:
log(f"Unexpected MQTT disconnection: {rc}", level="ERROR")
exit_gracefully(rc, skip_mqtt=True)
time.sleep(60)
mqtt_connect()
def exit_gracefully(rc, skip_mqtt=False): def exit_gracefully(rc, skip_mqtt=False):
global hosts, devices, mqtt_client global hosts, devices, mqtt_client

Loading…
Cancel
Save