diff --git a/mqtt_logger.py b/mqtt_logger.py index e93ee1f6c52998b48263df6d1c09e0373beef8ca..53d7f39763818d74f04ea4bbb2fea17a65805490 100644 --- a/mqtt_logger.py +++ b/mqtt_logger.py @@ -19,7 +19,7 @@ SOFTWARE. """ import logging -import paho.mqtt.client as mqtt +from paho.mqtt.client import MQTTv31 import paho.mqtt.publish as publish @@ -30,7 +30,7 @@ class MQTTHandler(logging.Handler): """ def __init__(self, hostname, topic, qos=0, retain=False, port=1883, client_id='', keepalive=60, will=None, auth=None, - tls=None, protocol=mqtt.MQTTv31, transport='tcp'): + tls=None, protocol=MQTTv31, transport='tcp'): logging.Handler.__init__(self) self.topic = topic self.qos = qos diff --git a/run.sh b/run.sh index 30e98988e9eb005153a49007e4cecd515f818db6..61eb5c72bd2127c03a2529bde5a92e34b49bdc98 100644 --- a/run.sh +++ b/run.sh @@ -1,2 +1,2 @@ -source ../ohmpy/bin/activate +source ./ohmpy/bin/activate python3 webserver.py diff --git a/settings.py b/settings.py index b1630ddae3b263deb1dfbe31dae9bc0b229af918..48d48a4efe99c3bef1480062e5ce4adce097f8c7 100644 --- a/settings.py +++ b/settings.py @@ -1,4 +1,4 @@ -from paho import mqtt +from paho.mqtt.client import MQTTv31 # OhmPi configuration OHMPI_CONFIG = { @@ -45,7 +45,7 @@ MQTT_LOGGING_CONFIG = { 'will': None, 'auth': None, 'tls':None, - 'protocol': mqtt.MQTTv31, + 'protocol': MQTTv31, 'transport': 'tcp', 'client_id': f'ohmpi_sn_{OHMPI_CONFIG["id"]}', 'control_topic': f'cmd_ohmpi_sn_{OHMPI_CONFIG["id"]}',