Skip to content

Fix: Prevent custom connectors from colliding #2117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ecoutier wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −4
Open

Fix: Prevent custom connectors from colliding #2117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions thingsboard_gateway/gateway/tb_gateway_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ def _load_connectors(self, config=None):
connector_config_from_main['name'])
continue
else:
self._implemented_connectors[connector_type] = connector_class
self._implemented_connectors[connector_config_from_main['name']] = connector_class
elif connector_type == "grpc":
if connector_config_from_main.get('key') == "auto":
self._generate_persistent_key(connector_config_from_main, connectors_persistent_keys)
Expand Down Expand Up @@ -1011,9 +1011,11 @@ def __connect_with_connectors(self):
for connector_type in self.connectors_configs:
connector_type = connector_type.lower()
for connector_config in self.connectors_configs[connector_type]:
if self._implemented_connectors.get(connector_type) is not None:
connector_name = connector_config["name"]
connector_class = self._implemented_connectors.get(connector_name)
if connector_class is not None:

if connector_type == 'grpc' or 'Grpc' in self._implemented_connectors[connector_type].__name__:
if connector_type == 'grpc' or 'Grpc' in self._implemented_connectors[connector_name].__name__:
self.__init_and_start_grpc_connector(connector_type, connector_config)
return

Expand Down Expand Up @@ -1049,7 +1051,7 @@ def __init_and_start_regular_connector(self, _id, _type, name, configuration):
available_connector = self.available_connectors_by_id.get(_id)

if available_connector is None or available_connector.is_stopped():
connector = self._implemented_connectors[_type](self, deepcopy(configuration), _type)
connector = self._implemented_connectors[name](self, deepcopy(configuration), _type)
connector.name = name
self.available_connectors_by_id[_id] = connector
self.available_connectors_by_name[name] = connector
Expand Down
Loading