thingsboard-aplcache
Changes
application/src/main/java/org/thingsboard/server/service/cluster/rpc/RpcSessionCreationFuture.java 63(+0 -63)
application/src/main/proto/cluster.proto 30(+30 -0)
Details
application/src/main/proto/cluster.proto 30(+30 -0)
diff --git a/application/src/main/proto/cluster.proto b/application/src/main/proto/cluster.proto
index e106d1b..ba72097 100644
--- a/application/src/main/proto/cluster.proto
+++ b/application/src/main/proto/cluster.proto
@@ -95,3 +95,33 @@ service ClusterRpcService {
rpc handlePluginMsgs(stream ToRpcServerMessage) returns (stream ToRpcServerMessage) {}
}
+message ClusterMessage {
+ MessageType messageType = 1;
+ MessageMataInfo messageMetaInfo = 2;
+ ServerAddress serverAdresss = 3;
+ bytes payload = 4;
+}
+
+message ServerAddress {
+ string host = 1;
+ int32 port = 2;
+}
+
+message MessageMataInfo {
+ string payloadMetaInfo = 1;
+ repeated string tags = 2;
+}
+
+
+enum MessageType {
+
+ //Cluster control messages
+ RPC_SESSION_CREATE_REQUEST_MSG = 0;
+ TO_ALL_NODES_MSG = 1;
+ RPC_SESSION_TELL_MSG = 2;
+ RPC_BROADCAST_MSG = 3;
+ CONNECT_RPC_MESSAGE =4;
+
+ //CLUSTER_DATA_MESSAGE
+ CLUSTER_NETWORK_SERVER_DATA_MESSAGE = 5;
+}
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java
index 0549e6a..a242093 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java
@@ -1,12 +1,12 @@
/**
* Copyright © 2016-2018 The Thingsboard Authors
- * <p>
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.