changed connection status updates

Cumulocity-IoT · Mar 17, 2024 · 0b30b49 · 0b30b49
1 parent 3946b02
commit 0b30b49
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...mapping-service/src/main/java/dynamic/mapping/connector/core/client/AConnectorClient.java b/...mapping-service/src/main/java/dynamic/mapping/connector/core/client/AConnectorClient.java
@@ -158,8 +158,6 @@ public void submitConnect() {
         if (connectTask == null || connectTask.isDone()) {
             connectTask = cachedThreadPool.submit(() -> connect());
         }
-        connectorStatus.updateStatus(ConnectorStatus.CONNECTING, true);
-        sendConnectorLifecycle();
     }
 
     public void submitDisconnect() {
@@ -171,8 +169,6 @@ public void submitDisconnect() {
         if (connectTask == null || connectTask.isDone()) {
             connectTask = cachedThreadPool.submit(() -> disconnect());
         }
-        connectorStatus.updateStatus(ConnectorStatus.DISCONNECTING, true);
-        sendConnectorLifecycle();
     }
 
     public void submitHousekeeping() {

diff --git a/dynamic-mapping-service/src/main/java/dynamic/mapping/connector/mqtt/MQTTClient.java b/dynamic-mapping-service/src/main/java/dynamic/mapping/connector/mqtt/MQTTClient.java
@@ -199,6 +199,8 @@ public ConnectorSpecification getSpecification() {
 
     @Override
     public void connect() {
+        connectorStatus.updateStatus(ConnectorStatus.CONNECTING, true);
+        sendConnectorLifecycle();
         log.info("Tenant {} - Establishing the MQTT connection now - phase I: (isConnected:shouldConnect) ({}:{})",
                 tenant, isConnected(),
                 shouldConnect());
@@ -371,6 +373,8 @@ public boolean isConnected() {
 
     @Override
     public void disconnect() {
+        connectorStatus.updateStatus(ConnectorStatus.DISCONNECTING, true);
+        sendConnectorLifecycle();
         log.info("Tenant {} - Disconnecting from MQTT broker: {}", tenant,
                 (mqttClient == null ? null : mqttClient.getConfig().getServerHost()));