mirror/thingsboard-gateway
1
0
Fork 0
mirror of https://github.com/thingsboard/thingsboard-gateway synced 2025-10-26 22:31:42 +08:00
Code Issues Releases Wiki Activity

Connection to ThingsBoard moved to separate thread.

Browse Source
This commit is contained in:
zbeacon
2019-11-29 12:59:30 +02:00
parent bd656454ce
commit 4f5325e08d
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
thingsboard_gateway/gateway/tb_client.py
View File

@@ -15,16 +15,21 @@
import logging import logging
import time import time
from thingsboard_gateway.tb_client.tb_gateway_mqtt import TBGatewayMqttClient from thingsboard_gateway.tb_client.tb_gateway_mqtt import TBGatewayMqttClient
import threading
log = logging.getLogger("tb_connection") log = logging.getLogger("tb_connection")
class TBClient: class TBClient(threading.Thread):
def __init__(self, config): def __init__(self, config):
super().__init__()
self.setName('Connection thread.')
self.daemon = True
self.__config = config self.__config = config
self.__host = config["host"] self.__host = config["host"]
self.__port = config.get("port", 1883) self.__port = config.get("port", 1883)
credentials = config["security"] credentials = config["security"]
self.__min_reconnect_delay = 10
self.__tls = False self.__tls = False
self.__ca_cert = None self.__ca_cert = None
self.__private_key = None self.__private_key = None
@@ -60,6 +65,10 @@ class TBClient:
self.client.disconnect() self.client.disconnect()
def connect(self, min_reconnect_delay=10): def connect(self, min_reconnect_delay=10):
self.__min_reconnect_delay = min_reconnect_delay
self.start()
def run(self):
keep_alive = self.__config.get("keep_alive", 60) keep_alive = self.__config.get("keep_alive", 60)
try: try:
while not self.client.is_connected(): while not self.client.is_connected():
@@ -69,9 +78,25 @@ class TBClient:
cert_file=self.__cert, cert_file=self.__cert,
key_file=self.__private_key, key_file=self.__private_key,
keepalive=keep_alive, keepalive=keep_alive,
min_reconnect_delay=min_reconnect_delay) min_reconnect_delay=self.__min_reconnect_delay)
time.sleep(1) time.sleep(1)
except Exception as e: except Exception as e:
log.exception(e) log.error("On connection to ThingsBoard: %s", str(e))
time.sleep(10) time.sleep(10)
while True:
if not self.client.is_connected():
try:
self.client.connect(tls=self.__tls,
ca_certs=self.__ca_cert,
cert_file=self.__cert,
key_file=self.__private_key,
keepalive=keep_alive,
min_reconnect_delay=self.__min_reconnect_delay)
except Exception as e:
log.error("On connection to ThingsBoard: %s", str(e))
time.sleep(self.__min_reconnect_delay)
time.sleep(.1)
else:
time.sleep(.1)