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

Moved connected device filename to constants

Browse Source
This commit is contained in:
zbeacon
2021-12-06 14:09:52 +02:00
parent 8c02b07a09
commit 8492130a0c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
thingsboard_gateway/gateway/tb_gateway_service.py
View File

@@ -24,6 +24,7 @@ from threading import RLock, Thread
from time import sleep, time
from simplejson import dumps, load, loads
from thingsboard_gateway.gateway.constants import CONNECTED_DEVICES_FILENAME
from yaml import safe_load
from thingsboard_gateway.gateway.tb_client import TBClient
@@ -87,7 +88,6 @@ class TBGatewayService:
self.name = ''.join(choice(ascii_lowercase) for _ in range(64))
self.__rpc_register_queue = Queue(-1)
self.__rpc_requests_in_progress = {}
self.__connected_devices_file = "connected_devices.json"
self.tb_client = TBClient(self.__config["thingsboard"], self._config_dir)
try:
self.tb_client.disconnect()
@@ -138,7 +138,6 @@ class TBGatewayService:
self.connectors_configs = {}
self.__remote_configurator = None
self.__request_config_after_connect = False
self.__connected_devices = {}
self.__load_persistent_devices()
self.__init_remote_configuration()
self._load_connectors()
@@ -748,15 +747,15 @@ class TBGatewayService:
def __load_persistent_devices(self):
devices = {}
if self.__connected_devices_file in listdir(self._config_dir) and \
path.getsize(self._config_dir + self.__connected_devices_file) > 0:
if CONNECTED_DEVICES_FILENAME in listdir(self._config_dir) and \
path.getsize(self._config_dir + CONNECTED_DEVICES_FILENAME) > 0:
try:
with open(self._config_dir + self.__connected_devices_file) as devices_file:
with open(self._config_dir + CONNECTED_DEVICES_FILENAME) as devices_file:
devices = load(devices_file)
except Exception as e:
log.exception(e)
else:
connected_devices_file = open(self._config_dir + self.__connected_devices_file, 'w')
connected_devices_file = open(self._config_dir + CONNECTED_DEVICES_FILENAME, 'w')
connected_devices_file.close()
if devices is not None:
@@ -764,7 +763,7 @@ class TBGatewayService:
for device_name in devices:
try:
if not isinstance(devices[device_name], tuple):
open(self._config_dir + self.__connected_devices_file, 'w').close()
open(self._config_dir + CONNECTED_DEVICES_FILENAME, 'w').close()
log.debug("Old connected_devices file, new file will be created")
return
if self.available_connectors.get(devices[device_name][0]):
@@ -782,7 +781,7 @@ class TBGatewayService:
self.__connected_devices = {} if self.__connected_devices is None else self.__connected_devices
def __save_persistent_devices(self):
with open(self._config_dir + self.__connected_devices_file, 'w') as config_file:
with open(self._config_dir + CONNECTED_DEVICES_FILENAME, 'w') as config_file:
try:
data_to_save = {}
for device in self.__connected_devices: