Merge branch 'hotfix/3.6'

3 years ago · c7874aa7e1
2 changed files with 10 additions and 8 deletions
--- a/common/cluster-api/src/main/proto/queue.proto
+++ b/common/cluster-api/src/main/proto/queue.proto
@ -877,13 +877,15 @@ message FromDeviceRPCResponseProto {
 }

 enum ComponentLifecycleEvent {
-    CREATED   = 0;
-    STARTED   = 1;
-    ACTIVATED = 2;
-    SUSPENDED = 3;
-    UPDATED   = 4;
-    STOPPED   = 5;
-    DELETED   = 6;
+    CREATED       = 0;
+    STARTED       = 1;
+    ACTIVATED     = 2;
+    SUSPENDED     = 3;
+    UPDATED       = 4;
+    STOPPED       = 5;
+    DELETED       = 6;
+    FAILED        = 7;
+    DEACTIVATED   = 8;
 }

 message ComponentLifecycleMsgProto {
--- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java
@ -22,5 +22,5 @@ import java.io.Serializable;
 */
 public enum ComponentLifecycleEvent implements Serializable {
    // In sync with ComponentLifecycleEvent proto
-    CREATED, STARTED, ACTIVATED, SUSPENDED, UPDATED, STOPPED, DELETED
+    CREATED, STARTED, ACTIVATED, SUSPENDED, UPDATED, STOPPED, DELETED, FAILED, DEACTIVATED
 }