diff --git a/scripts/inenvmon_collector.py b/scripts/inenvmon_collector.py index 492820e..212375a 100644 --- a/scripts/inenvmon_collector.py +++ b/scripts/inenvmon_collector.py @@ -5,6 +5,7 @@ import paho.mqtt.client as mqtt import time import datetime import requests +#import ssl MQTT_Broker = "127.0.0.1" MQTT_Port = @@ -42,14 +43,14 @@ def on_connect(client, userdata, flags, rc): def on_message(mosq, obj, msg): try: procdm = msg.payload.decode("unicode_escape").split(",") - if procdm[4] == -1: - procdm[4] = None; + if procdm[3] == -1: + procdm[3] = None; except Exception as ex: print("Fug: %s" % ex) f = '%Y-%m-%d %H:%M:%S' - sql = "INSERT INTO envdata (timestamp, temp, hum, pres, co2) VALUES (%s, %s, %s, %s, %s)" % (str("\"%s\"") % datetime.datetime.now().strftime(f), str("\"%s\"") % procdm[1], str("\"%s\"") % procdm[2], str("\"%s\"") % procdm[3], str("\"%s\"") % procdm[4]) + sql = "INSERT INTO envdata (timestamp, temp, hum, pres, co2) VALUES (%s, %s, %s, %s, %s)" % (str("\"%s\"") % datetime.datetime.now().strftime(f), str("\"%s\"") % procdm[0], str("\"%s\"") % procdm[1], str("\"%s\"") % procdm[2], str("\"%s\"") % procdm[3]) write_db(sql) send_heartbeat() @@ -62,8 +63,8 @@ mqttc.on_message = on_message mqttc.on_connect = on_connect mqttc.on_subscribed = on_subscribed -mqttc.username_pw_set(MQTT_Auth['username'], MQTT_Auth['password]) +#mqttc.tls_set(ca_certs="/etc/ssl/cert.pem", tls_version=ssl.PROTOCOL_TLSv1_2) +mqttc.username_pw_set(MQTT_Auth['username'], MQTT_Auth['password']) mqttc.connect(MQTT_Broker, int(MQTT_Port), int(Keep_Alive_Interval)) mqttc.loop_forever() -