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

Fixed push to updates

Browse Source
This commit is contained in:
Volodymyr Babak 2020-05-11 12:31:56 +03:00
parent 12b5a932c3
commit 2af6e5d3d6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java
View File

@ -313,7 +313,6 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
switch (target.getEntityType()) { switch (target.getEntityType()) {
case RULE_NODE: case RULE_NODE:
pushMsgToNode(nodeActors.get(new RuleNodeId(target.getId())), msg, fromRelationType); pushMsgToNode(nodeActors.get(new RuleNodeId(target.getId())), msg, fromRelationType);
pushUpdatesToEdges(msg);
break; break;
case RULE_CHAIN: case RULE_CHAIN:
parent.tell(new RuleChainToRuleChainMsg(new RuleChainId(target.getId()), entityId, msg, fromRelationType), self); parent.tell(new RuleChainToRuleChainMsg(new RuleChainId(target.getId()), entityId, msg, fromRelationType), self);
@ -347,6 +346,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
private void pushMsgToNode(RuleNodeCtx nodeCtx, TbMsg msg, String fromRelationType) { private void pushMsgToNode(RuleNodeCtx nodeCtx, TbMsg msg, String fromRelationType) {
if (nodeCtx != null) { if (nodeCtx != null) {
pushUpdatesToEdges(msg);
nodeCtx.getSelfActor().tell(new RuleChainToRuleNodeMsg(new DefaultTbContext(systemContext, nodeCtx), msg, fromRelationType), self); nodeCtx.getSelfActor().tell(new RuleChainToRuleNodeMsg(new DefaultTbContext(systemContext, nodeCtx), msg, fromRelationType), self);
} else { } else {
log.error("[{}][{}] RuleNodeCtx is empty", entityId, ruleChainName); log.error("[{}][{}] RuleNodeCtx is empty", entityId, ruleChainName);

2
application/src/main/resources/thingsboard.yml
View File

@ -567,7 +567,7 @@ transport:
edges: edges:
rpc: rpc:
enabled: "${EDGES_RPC_ENABLED:true}" enabled: "${EDGES_RPC_ENABLED:true}"
port: "${EDGES_RPC_PORT:60061}" port: "${EDGES_RPC_PORT:60100}"
ssl: ssl:
# Enable/disable SSL support # Enable/disable SSL support
enabled: "${EDGES_RPC_SSL_ENABLED:false}" enabled: "${EDGES_RPC_SSL_ENABLED:false}"