From f3b8b55ade4529e00095a412ff93ffac2ee16e04 Mon Sep 17 00:00:00 2001 From: "Maarten Kossen (mpkossen)" Date: Fri, 29 Mar 2024 14:51:50 -0500 Subject: Use enum instead of int for callback API version. --- glances/exports/mqtt/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/glances/exports/mqtt/__init__.py b/glances/exports/mqtt/__init__.py index a3202a65..94279749 100755 --- a/glances/exports/mqtt/__init__.py +++ b/glances/exports/mqtt/__init__.py @@ -63,12 +63,18 @@ class Export(GlancesExport): def init(self): # Get the current callback api version self.callback_api_version = int(self.callback_api_version) or 2 + + # Set enum for connection + if self.callback_api_version == 1: + self.callback_api_version = paho.CallbackAPIVersion.VERSION1 + else: + self.callback_api_version = paho.CallbackAPIVersion.VERSION2 """Init the connection to the MQTT server.""" if not self.export_enable: return None try: - client = paho.Client(client_id='glances_' + self.devicename, clean_session=False) + client = paho.Client(callback_api_version=self.callback_api_version, client_id='glances_' + self.devicename, clean_session=False) client.username_pw_set(username=self.user, password=self.password) if self.tls: client.tls_set(certifi.where()) -- cgit v1.2.3