iris: Compatibility with aiomqtt 2.0

diff --git a/rainbow/iris/burrow-iris.py b/rainbow/iris/burrow-iris.py
index a734b2ae2bbd7fcb4db792789c5feeb2794a61ee..50bfc1d8ce7939e791aa1a97fff58f73d1e005b0 100755 (executable)
--- a/rainbow/iris/burrow-iris.py
+++ b/rainbow/iris/burrow-iris.py
@@ -159,17 +159,15 @@ async def mqtt_loop():
 
     will = aiomqtt.Will(topic='status/iris', payload='dead', qos=1, retain=True)
 
-    mqtt = aiomqtt.Client(client_id='iris', hostname="burrow-mqtt", port=8883, tls_context=sctx, will=will)
-    await mqtt.connect()
-    global st
-    st = State(mqtt)
-    async with mqtt.messages() as messages:
+    async with aiomqtt.Client(hostname="burrow-mqtt", port=8883, tls_context=sctx, will=will) as mqtt:
+        global st
+        st = State(mqtt)
         await mqtt.subscribe("burrow/air/ac-on")
         await mqtt.subscribe("burrow/heating/#")
         await mqtt.subscribe("burrow/temp/#")
         await mqtt.subscribe("burrow/power/current/#")
         await mqtt.publish("status/iris", "ok", retain=True)
-        async for msg in messages:
+        async for msg in mqtt.messages:
             await mqtt_process_msg(msg.topic.value, msg.payload.decode())