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

Fix for #692

Browse Source
This commit is contained in:
zbeacon
2022-01-20 09:05:22 +02:00
parent 64a0fa6d5c
commit eb4e71fa69
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
thingsboard_gateway/gateway/tb_client.py
View File

@@ -14,7 +14,7 @@
import logging import logging
import threading import threading
from time import time, sleep from time import sleep
from ssl import CERT_REQUIRED, PROTOCOL_TLSv1_2 from ssl import CERT_REQUIRED, PROTOCOL_TLSv1_2
from thingsboard_gateway.tb_client.tb_gateway_mqtt import TBGatewayMqttClient from thingsboard_gateway.tb_client.tb_gateway_mqtt import TBGatewayMqttClient
@@ -27,6 +27,7 @@ class TBClient(threading.Thread):
super().__init__() super().__init__()
self.setName('Connection thread.') self.setName('Connection thread.')
self.daemon = True self.daemon = True
self.__config_folder_path = config_folder_path
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)
@@ -45,9 +46,9 @@ class TBClient(threading.Thread):
self.__token = str(credentials["accessToken"]) self.__token = str(credentials["accessToken"])
self.client = TBGatewayMqttClient(self.__host, self.__port, self.__token, self, quality_of_service=self.__default_quality_of_service) self.client = TBGatewayMqttClient(self.__host, self.__port, self.__token, self, quality_of_service=self.__default_quality_of_service)
if self.__tls: if self.__tls:
self.__ca_cert = config_folder_path + credentials.get("caCert") if credentials.get("caCert") is not None else None self.__ca_cert = self.__config_folder_path + credentials.get("caCert") if credentials.get("caCert") is not None else None
self.__private_key = config_folder_path + credentials.get("privateKey") if credentials.get("privateKey") is not None else None self.__private_key = self.__config_folder_path + credentials.get("privateKey") if credentials.get("privateKey") is not None else None
self.__cert = config_folder_path + credentials.get("cert") if credentials.get("cert") is not None else None self.__cert = self.__config_folder_path + credentials.get("cert") if credentials.get("cert") is not None else None
self.client._client.tls_set(ca_certs=self.__ca_cert, self.client._client.tls_set(ca_certs=self.__ca_cert,
certfile=self.__cert, certfile=self.__cert,
keyfile=self.__private_key, keyfile=self.__private_key,
@@ -144,3 +145,6 @@ class TBClient(threading.Thread):
self.__stopped = True self.__stopped = True
except Exception as e: except Exception as e:
log.exception(e) log.exception(e)
def get_config_folder_path(self):
return self.__config_folder_path

2
thingsboard_gateway/tb_utility/tb_gateway_remote_configurator.py
View File

@@ -197,7 +197,7 @@ class RemoteConfigurator:
self.__old_tb_client.unsubscribe('*') self.__old_tb_client.unsubscribe('*')
self.__old_tb_client.stop() self.__old_tb_client.stop()
self.__old_tb_client.disconnect() self.__old_tb_client.disconnect()
self.__gateway.tb_client = TBClient(self.__new_general_configuration_file["thingsboard"]) self.__gateway.tb_client = TBClient(self.__new_general_configuration_file["thingsboard"], self.__old_tb_client.get_config_folder_path())
self.__gateway.tb_client.connect() self.__gateway.tb_client.connect()
connection_state = False connection_state = False
while time() * 1000 - apply_start < self.__apply_timeout * 1000 and not connection_state: while time() * 1000 - apply_start < self.__apply_timeout * 1000 and not connection_state: