dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop/3.0

Browse Source
This commit is contained in:
Andrii Shvaika 2020-04-30 18:11:56 +03:00
commit d866fc1503
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/data/json/demo/rule_chains/root_rule_chain.json
View File

@ -3,7 +3,7 @@
"additionalInfo": null, "additionalInfo": null,
"name": "Root Rule Chain", "name": "Root Rule Chain",
"firstRuleNodeId": null, "firstRuleNodeId": null,
"root": false, "root": true,
"debugMode": false, "debugMode": false,
"configuration": null "configuration": null
}, },

1
common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java
View File

@ -106,6 +106,7 @@ public class TbKafkaConsumerTemplate<T extends TbQueueMsg> implements TbQueueCon
if (!subscribed) { if (!subscribed) {
List<String> topicNames = partitions.stream().map(TopicPartitionInfo::getFullTopicName).collect(Collectors.toList()); List<String> topicNames = partitions.stream().map(TopicPartitionInfo::getFullTopicName).collect(Collectors.toList());
topicNames.forEach(admin::createTopicIfNotExists); topicNames.forEach(admin::createTopicIfNotExists);
consumer.unsubscribe();
consumer.subscribe(topicNames); consumer.subscribe(topicNames);
subscribed = true; subscribed = true;
} }

2
docker/tb-node.env
View File

@ -10,3 +10,5 @@ CACHE_TYPE=redis
REDIS_HOST=redis REDIS_HOST=redis
HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE=false HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE=false
TB_QUEUE_PARTITIONS_VIRTUAL_NODES_SIZE=64