From d3972cc8edc6907dc3a314e10997143cf75c5950 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sun, 6 Mar 2022 14:02:35 +0100
Subject: [PATCH] Fixes mqtt_logger
---
mqtt_logger.py | 4 ++--
run.sh | 2 +-
settings.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mqtt_logger.py b/mqtt_logger.py
index e93ee1f6..53d7f397 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 30e98988..61eb5c72 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 b1630dda..48d48a4e 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"]}',
--
GitLab