From 1ea086676ffd0dc9d91ab5c6721458a793b289cb Mon Sep 17 00:00:00 2001 From: Bogdan Vlaicu Date: Fri, 12 Feb 2021 19:12:49 -0500 Subject: [PATCH] oru logging improvements --- oru/config.json | 2 +- oru/run.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/oru/config.json b/oru/config.json index 8dc35d1..431b985 100755 --- a/oru/config.json +++ b/oru/config.json @@ -1,6 +1,6 @@ { "name": "Orange and Rockland Utility to MQTT Bridge", - "version": "0.2.4", + "version": "0.2.57", "slug": "oru", "description": "Orange and Rockland Utility meter reading to MQTT", "url": "https://github.com/bvlaicu/home-assistant-addons/tree/master/oru", diff --git a/oru/run.py b/oru/run.py index 4b8284b..d3855a4 100755 --- a/oru/run.py +++ b/oru/run.py @@ -3,6 +3,7 @@ import asyncio from coned import Meter from coned import MeterError import paho.mqtt.client as mqtt +import json meter = Meter( email=os.getenv("EMAIL"), @@ -14,15 +15,18 @@ meter = Meter( site=os.getenv("SITE"), browser_path="/usr/bin/google-chrome-stable" ) -startTime, endTime, val, uom = asyncio.get_event_loop().run_until_complete(meter.last_read()) +startTime, endTime, value, uom = asyncio.get_event_loop().run_until_complete(meter.last_read()) -print(f"startTime: {startTime}, endTime: {endTime}, val: {val}, uom: {uom}") +message = {'startTime': startTime, 'endTime': endTime, 'value': value, 'uom': uom} + +print(f"message: {message}") mqttc = mqtt.Client("oru_meter_reader") mqttc.username_pw_set(username=os.getenv("MQTT_USER"), password=os.getenv("MQTT_PASS")) mqttc.connect(os.getenv("MQTT_HOST")) mqttc.publish('electric_meter/startTime', startTime, retain=True) mqttc.publish('electric_meter/endTime', endTime, retain=True) -mqttc.publish('electric_meter/value', val, retain=True) +mqttc.publish('electric_meter/value', value, retain=True) mqttc.publish('electric_meter/uom', uom, retain=True) +mqttc.publish('electric_meter/message', json.dumps(message), retain=True) mqttc.disconnect()