Merge pull request thingsboard#1260 from samson0v/master

Fixed FTP RPCs processing
wilterdinkrobert · Dec 12, 2023 · afcc1da · afcc1da
2 parents a4f13fb + 1db9274
commit afcc1da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/thingsboard_gateway/connectors/ftp/ftp_connector.py b/thingsboard_gateway/connectors/ftp/ftp_connector.py
@@ -28,16 +28,8 @@
 from thingsboard_gateway.connectors.ftp.ftp_uplink_converter import FTPUplinkConverter
 from thingsboard_gateway.connectors.ftp.path import Path
 from thingsboard_gateway.gateway.statistics_service import StatisticsService
-from thingsboard_gateway.tb_utility.tb_utility import TBUtility
 from thingsboard_gateway.tb_utility.tb_logger import init_logger
 
-try:
-    from requests import Timeout, request
-except ImportError:
-    print("Requests library not found - installing...")
-    TBUtility.install_package("requests")
-    from requests import Timeout, request
-
 from thingsboard_gateway.connectors.connector import Connector
 
 
@@ -83,6 +75,7 @@ def __init__(self, gateway, config, connector_type):
                 )
             for obj in self.__config['paths']
             ]
+        self.__log.info('FTP Connector started.')
 
     def open(self):
         self.__stopped = False
@@ -193,6 +186,7 @@ def __send_data(self, converted_data):
 
     def close(self):
         self.__stopped = True
+        self.__log.info('FTP Connector stopped.')
         self.__log.reset()
 
     def get_name(self):
@@ -276,7 +270,7 @@ def server_side_rpc_handler(self, content):
                 if fullmatch(rpc_request['deviceNameFilter'], content['device']) and fullmatch(
                         rpc_request['methodFilter'], content['data']['method']):
                     with self.__ftp() as ftp:
-                        if not self._connected:
+                        if not self._connected or not ftp.sock:
                             self.__connect(ftp)
 
                         converted_data = None

diff --git a/thingsboard_gateway/gateway/statistics_service.py b/thingsboard_gateway/gateway/statistics_service.py
@@ -125,7 +125,8 @@ def inner(*args, **kwargs):
                 except ValueError:
                     pass
 
-                func(*args, **kwargs)
+                result = func(*args, **kwargs)
+                return result
 
             return inner