Showing
3 changed files
with
4 additions
and
6 deletions
| @@ -397,11 +397,6 @@ public class TelemetryController extends BaseController { | @@ -397,11 +397,6 @@ public class TelemetryController extends BaseController { | ||
| 397 | @Override | 397 | @Override |
| 398 | public void onSuccess(@Nullable Void tmp) { | 398 | public void onSuccess(@Nullable Void tmp) { |
| 399 | logAttributesUpdated(user, entityId, scope, attributes, null); | 399 | logAttributesUpdated(user, entityId, scope, attributes, null); |
| 400 | - if (entityIdSrc.getEntityType().equals(EntityType.DEVICE)) { | ||
| 401 | - DeviceId deviceId = new DeviceId(entityId.getId()); | ||
| 402 | - tbClusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onUpdate( | ||
| 403 | - user.getTenantId(), deviceId, scope, attributes), null); | ||
| 404 | - } | ||
| 405 | result.setResult(new ResponseEntity(HttpStatus.OK)); | 400 | result.setResult(new ResponseEntity(HttpStatus.OK)); |
| 406 | } | 401 | } |
| 407 | 402 |
| @@ -109,7 +109,7 @@ public abstract class AbstractMqttTelemetryIntegrationTest extends AbstractContr | @@ -109,7 +109,7 @@ public abstract class AbstractMqttTelemetryIntegrationTest extends AbstractContr | ||
| 109 | client.setCallback(callback); | 109 | client.setCallback(callback); |
| 110 | client.connect(options).waitForCompletion(5000); | 110 | client.connect(options).waitForCompletion(5000); |
| 111 | client.subscribe("v1/devices/me/attributes", MqttQoS.AT_MOST_ONCE.value()); | 111 | client.subscribe("v1/devices/me/attributes", MqttQoS.AT_MOST_ONCE.value()); |
| 112 | - String payload = "{\"key\":\"value\"}"; | 112 | + String payload = "{\"key\":\"uniqueValue\"}"; |
| 113 | // TODO 3.1: we need to acknowledge subscription only after it is processed by device actor and not when the message is pushed to queue. | 113 | // TODO 3.1: we need to acknowledge subscription only after it is processed by device actor and not when the message is pushed to queue. |
| 114 | // MqttClient -> SUB REQUEST -> Transport -> Kafka -> Device Actor (subscribed) | 114 | // MqttClient -> SUB REQUEST -> Transport -> Kafka -> Device Actor (subscribed) |
| 115 | // MqttClient <- SUB_ACK <- Transport | 115 | // MqttClient <- SUB_ACK <- Transport |
| @@ -37,6 +37,9 @@ service.type=monolith | @@ -37,6 +37,9 @@ service.type=monolith | ||
| 37 | #spring.datasource.driverClassName=org.postgresql.Driver | 37 | #spring.datasource.driverClassName=org.postgresql.Driver |
| 38 | #spring.datasource.hikari.maximumPoolSize = 50 | 38 | #spring.datasource.hikari.maximumPoolSize = 50 |
| 39 | 39 | ||
| 40 | +queue.core.pack-processing-timeout=3000 | ||
| 41 | +queue.rule-engine.pack-processing-timeout=3000 | ||
| 42 | + | ||
| 40 | queue.rule-engine.queues[0].name=Main | 43 | queue.rule-engine.queues[0].name=Main |
| 41 | queue.rule-engine.queues[0].topic=tb_rule_engine.main | 44 | queue.rule-engine.queues[0].topic=tb_rule_engine.main |
| 42 | queue.rule-engine.queues[0].poll-interval=25 | 45 | queue.rule-engine.queues[0].poll-interval=25 |