Browse Source

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

pull/2709/head
Andrii Shvaika 6 years ago
parent
commit
d866fc1503
  1. 2
      application/src/main/data/json/demo/rule_chains/root_rule_chain.json
  2. 1
      common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java
  3. 2
      docker/tb-node.env

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

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

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

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

2
docker/tb-node.env

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

Loading…
Cancel
Save