From 843b9bb2b624ab0ab488a1421ed0f1e2167386ce Mon Sep 17 00:00:00 2001
From: samson0v <vitalikbidochka@gmail.com>
Date: Tue, 25 Jul 2023 12:10:27 +0300
Subject: [PATCH] Changed updating remote configuration algorithm

---
 .../gateway/tb_gateway_service.py             | 14 ++++++-
 .../tb_gateway_remote_configurator.py         | 41 +++++++++++++++++--
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/thingsboard_gateway/gateway/tb_gateway_service.py b/thingsboard_gateway/gateway/tb_gateway_service.py
index 260f9beb..4c32039e 100644
--- a/thingsboard_gateway/gateway/tb_gateway_service.py
+++ b/thingsboard_gateway/gateway/tb_gateway_service.py
@@ -334,7 +334,8 @@ class TBGatewayService:
             log.warning('YAML configuration will be deprecated in the future version. '
                         'Please, use JSON configuration instead.')
             log.warning(
-                'See default configuration file on https://github.com/thingsboard/thingsboard-gateway/blob/master/thingsboard_gateway/config/tb_gateway.json')
+                'See default configuration on '
+                'https://thingsboard.io/docs/iot-gateway/configuration/?storageConfig=sqlite#storage-configuration')
 
             config = {}
             try:
@@ -835,6 +836,17 @@ class TBGatewayService:
             self._load_connectors()
             self._connect_with_connectors()
 
+            # Updating global self.__config['connectors'] configuration for states syncing
+            for connector_type in self.connectors_configs:
+                for connector_config in self.connectors_configs[connector_type]:
+                    for (index, connector) in enumerate(self.__config['connectors']):
+                        if connector_config['config'].get(connector['configuration']):
+                            self.__config['connectors'][index]['configurationJson'] = connector_config['config'][
+                                connector['configuration']]
+
+            if self.__remote_configurator is not None:
+                self.__remote_configurator.send_current_configuration()
+
     def send_to_storage(self, connector_name, data):
         try:
             device_valid = True
diff --git a/thingsboard_gateway/tb_utility/tb_gateway_remote_configurator.py b/thingsboard_gateway/tb_utility/tb_gateway_remote_configurator.py
index 724008ef..0c6d5985 100644
--- a/thingsboard_gateway/tb_utility/tb_gateway_remote_configurator.py
+++ b/thingsboard_gateway/tb_utility/tb_gateway_remote_configurator.py
@@ -1,3 +1,4 @@
+import os.path
 from logging import getLogger
 from time import sleep, time
 from logging.config import dictConfig
@@ -33,6 +34,12 @@ class RemoteConfigurator:
             'RemoteLoggingLevel': self._handle_remote_logging_level_update,
             r'(?=\D*\d?).*': self._handle_connector_configuration_update,
         }
+        self._modifiable_static_attrs = {
+            'general_configuration': 'tb_gateway.json',
+            'storage_configuration': 'tb_gateway.json',
+            'grpc_configuration': 'tb_gateway.json',
+            'logs_configuration': 'logs.json'
+        }
         LOG.info('Remote Configurator started')
 
     @property
@@ -61,7 +68,11 @@ class RemoteConfigurator:
 
     @property
     def connectors_configuration(self):
-        return self._config.get('connectors', [])
+        connectors = self._config.get('connectors', [])
+        for connector in connectors:
+            connector.pop('config_updated', None)
+            connector.pop('config_file_path', None)
+        return connectors
 
     def _get_active_connectors(self):
         return [connector['name'] for connector in self.connectors_configuration]
@@ -154,9 +165,13 @@ class RemoteConfigurator:
                     if 'deleted' in attr_name:
                         continue
 
+                    request_config = config[attr_name]
+                    if not self._is_modified(attr_name, request_config):
+                        continue
+
                     for (name, func) in self._handlers.items():
                         if fullmatch(name, attr_name):
-                            func(config[attr_name])
+                            func(request_config)
                             break
             except (KeyError, AttributeError):
                 LOG.error('Unknown attribute update name (Available: %s)', ', '.join(self._handlers.keys()))
@@ -165,6 +180,26 @@ class RemoteConfigurator:
         else:
             LOG.error("Remote configuration is already in processing")
 
+    def _is_modified(self, attr_name, config):
+        try:
+            file_path = config.get('configuration') or self._modifiable_static_attrs.get(attr_name)
+        except AttributeError:
+            file_path = None
+
+        # if there is no file path that means that it is RemoteLoggingLevel or active_connectors attribute update
+        # in this case, we have to update the configuration without TS compare
+        if file_path is None:
+            return True
+
+        try:
+            file_path = self._gateway.get_config_path() + file_path
+            if config.get('ts', 0) <= int(os.path.getmtime(file_path) * 1000):
+                return False
+        except OSError:
+            LOG.warning('File %s not exist', file_path)
+
+        return True
+
     # HANDLERS ---------------------------------------------------------------------------------------------------------
     def _handle_general_configuration_update(self, config):
         """
@@ -358,7 +393,7 @@ class RemoteConfigurator:
             # else:
             configuration = config['configuration']
             with open(self._gateway.get_config_path() + configuration, 'w') as file:
-                config['configurationJson'].update({'logLevel': config['log_level'], 'name': config['name']})
+                config['configurationJson'].update({'logLevel': config['logLevel'], 'name': config['name']})
                 file.writelines(dumps(config['configurationJson']))
 
             found_connectors = list(filter(lambda item: item['name'] == config['name'], self.connectors_configuration))