Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MQTT connector buffering #1465

Merged
merged 1 commit into from
Jul 18, 2024
Merged

MQTT connector buffering #1465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions thingsboard_gateway/connectors/mqtt/mqtt_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@
from thingsboard_gateway.tb_utility.tb_logger import init_logger

try:
from paho.mqtt.client import Client
from paho.mqtt.client import Client, Properties
from paho.mqtt.packettypes import PacketTypes
except ImportError:
print("paho-mqtt library not found")
TBUtility.install_package("tb-paho-mqtt-client")
from paho.mqtt.client import Client
from paho.mqtt.client import Client, Properties
from paho.mqtt.packettypes import PacketTypes

from paho.mqtt.client import MQTTv31, MQTTv311, MQTTv5

Expand Down Expand Up @@ -182,9 +184,16 @@ def __init__(self, gateway, config, connector_type):
# Set up external MQTT broker connection -----------------------------------------------------------------------
client_id = self.__broker.get("clientId", ''.join(random.choice(string.ascii_lowercase) for _ in range(23)))

self._cleanSession = self.__broker.get("cleanSession",True)
self._cleanStart = self.__broker.get("cleanStart",True)
self._sessionExpiryInterval = self.__broker.get("sessionExpiryInterval", 0)

self._mqtt_version = self.__broker.get('version', 5)
try:
self._client = Client(client_id, protocol=MQTT_VERSIONS[self._mqtt_version])
if self._mqtt_version != 5:
self._client = Client(client_id, clean_session=self._cleanSession, protocol=MQTT_VERSIONS[self._mqtt_version])
else:
self._client = Client(client_id, protocol=MQTT_VERSIONS[self._mqtt_version])
except KeyError:
self.__log.error('Unknown MQTT version. Starting up on version 5...')
self._client = Client(client_id, protocol=MQTTv5)
Expand Down Expand Up @@ -322,8 +331,16 @@ def run(self):
def __connect(self):
while not self._connected and not self.__stopped:
try:
self._client.connect(self.__broker['host'],
if self._mqtt_version != 5:
self._client.connect(self.__broker['host'],
self.__broker.get('port', 1883))
else:
properties=Properties(PacketTypes.CONNECT)
properties.SessionExpiryInterval = self._sessionExpiryInterval
self._client.connect(self.__broker['host'],
self.__broker.get('port', 1883),
clean_start = self._cleanStart,
properties = properties)
self._client.loop_start()
if not self._connected:
sleep(1)
Expand Down