3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mqtt: implements last will and testament 

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
This commit is contained in:
Pedro Lamas 2021-11-07 22:29:11 +00:00 committed by Eric Callahan
parent ca27c2cf10
commit bed239c90a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
moonraker/components/mqtt.py
View File

@ -1,4 +1,4 @@
# MQTT client implemenation for Moonraker # MQTT client implementation for Moonraker
# #
# Copyright (C) 2021 Eric Callahan <arksine.code@gmail.com> # Copyright (C) 2021 Eric Callahan <arksine.code@gmail.com>
# #
@ -191,6 +191,7 @@ class MQTTClient(APITransport, Subscribable):
self.api_request_topic = f"{self.instance_name}/moonraker/api/request" self.api_request_topic = f"{self.instance_name}/moonraker/api/request"
self.api_resp_topic = f"{self.instance_name}/moonraker/api/response" self.api_resp_topic = f"{self.instance_name}/moonraker/api/response"
self.klipper_status_topic = f"{self.instance_name}/klipper/status" self.klipper_status_topic = f"{self.instance_name}/klipper/status"
self.moonraker_status_topic = f"{self.instance_name}/moonraker/status"
status_cfg = config.get("status_objects", None) status_cfg = config.get("status_objects", None)
self.status_objs: Dict[str, Any] = {} self.status_objs: Dict[str, Any] = {}
if status_cfg is not None: if status_cfg is not None:
@ -235,6 +236,9 @@ class MQTTClient(APITransport, Subscribable):
self.helper = AIOHelper(self.client) self.helper = AIOHelper(self.client)
if self.user_name is not None: if self.user_name is not None:
self.client.username_pw_set(self.user_name, self.password) self.client.username_pw_set(self.user_name, self.password)
self.client.will_set(self.moonraker_status_topic,
payload=json.dumps({'server': 'offline'}),
qos=self.qos, retain=True)
retries = 5 retries = 5
for _ in range(retries): for _ in range(retries):
try: try:
@ -288,6 +292,8 @@ class MQTTClient(APITransport, Subscribable):
) -> None: ) -> None:
logging.info("MQTT Client Connected") logging.info("MQTT Client Connected")
if reason_code == 0: if reason_code == 0:
self.publish_topic(self.moonraker_status_topic,
{'server': 'online'}, retain=True)
subs = [(k, v[0]) for k, v in self.subscribed_topics.items()] subs = [(k, v[0]) for k, v in self.subscribed_topics.items()]
if subs: if subs:
res, msg_id = client.subscribe(subs) res, msg_id = client.subscribe(subs)
@ -619,6 +625,9 @@ class MQTTClient(APITransport, Subscribable):
self.reconnect_task = None self.reconnect_task = None
if not self.is_connected(): if not self.is_connected():
return return
await self.publish_topic(self.moonraker_status_topic,
{'server': 'offline'},
retain=True)
self.disconnect_evt = asyncio.Event() self.disconnect_evt = asyncio.Event()
self.client.disconnect() self.client.disconnect()
try: try: