diff options
| author | jwansek <eddie.atten.ea29@gmail.com> | 2023-11-27 14:23:26 +0000 |
|---|---|---|
| committer | jwansek <eddie.atten.ea29@gmail.com> | 2023-11-27 14:23:26 +0000 |
| commit | f9da9ab448f59580180a46d2a9efc099ff09beb3 (patch) | |
| tree | 3e7e74a64c9869566e344060d8334881d441ec4d | |
| parent | 4aa61816bbd51c296c3966895951ecd4814510cb (diff) | |
| download | power.eda.gay-f9da9ab448f59580180a46d2a9efc099ff09beb3.tar.gz power.eda.gay-f9da9ab448f59580180a46d2a9efc099ff09beb3.zip | |
Updated logging
| -rw-r--r-- | docker-compose.yml | 3 | ||||
| -rw-r--r-- | mqtt-client/mqtt-client.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 7c511ac..bede2ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,7 @@ services: - ./.passwords:/mosquitto/passwd_file - mosquitto-data:/mosquitto/data - mosquitto-logs:/mosquitto/log + restart: unless-stopped influxdb: image: influxdb:2.0 @@ -23,6 +24,7 @@ services: - ./config.env depends_on: - mqtt + restart: unless-stopped mqtt_client: image: jwansek/mqtt-client @@ -33,6 +35,7 @@ services: - ./config.env depends_on: - influxdb + restart: unless-stopped volumes: mosquitto-data: diff --git a/mqtt-client/mqtt-client.py b/mqtt-client/mqtt-client.py index 9b0df83..c51f4b8 100644 --- a/mqtt-client/mqtt-client.py +++ b/mqtt-client/mqtt-client.py @@ -22,11 +22,11 @@ class MQTTClient: self.mqttc.loop_forever() def _on_connect_cb(self, mqtt, userdata, flags, rc): - print("Connected to broker") + #print("Connected to broker") self.mqttc.subscribe("tele/+/SENSOR") def _on_message_cb(self, mqtt, userdata, msg): - print('Topic: {0} | Message: {1}'.format(msg.topic, msg.payload)) + #print('Topic: {0} | Message: {1}'.format(msg.topic, msg.payload)) if "Tasmota" in msg.topic: self.handle_tasmota(msg) @@ -34,7 +34,7 @@ class MQTTClient: def handle_tasmota(self, msg): from_ = msg.topic.split("/")[1] msg_j = json.loads(msg.payload.decode()) - #print(from_) + print("'%s' is using %.1fw @ %s. %.1fkWh so far today, %.1fkWh yesterday" % (from_, msg_j["ENERGY"]["Power"], msg_j["Time"], msg_j["ENERGY"]["Today"], msg_j["ENERGY"]["Yesterday"])) fields = {k: v for k, v in msg_j["ENERGY"].items() if k not in {"TotalStartTime"}} points = [{"measurement": "tasmota_power", "tags": {"plug": from_}, "fields": fields}] write_api = self.influxc.write_api(write_options = SYNCHRONOUS) |