Quellcode durchsuchen

fixed 设备删除
add 集群消息回复
add 集群id不可重复

18339543638 vor 4 Jahren
Ursprung
Commit
1a410ecbfd

+ 3 - 2
jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/cluster/RedisHaManager.java

@@ -163,8 +163,9 @@ public class RedisHaManager implements HaManager {
                 if(currentServer().duplication(serverNode)){
                     if(currentServer().isAfter(serverNode)){
                         //集群节点id重复且该节点后启动
-                        log.error("集群节点id    [{}]    不可重复,将关闭该应用",serverNode.getId());
-                        System.exit(1);
+//                        log.error("集群节点id    [{}]    不可重复,将关闭该应用",serverNode.getId());
+//                        System.exit(1);
+                        throw new IllegalArgumentException("集群节点id    [{}]    不可重复,将关闭该应用");
                     }
                 }
                 serverNode.setLastKeepAlive(System.currentTimeMillis());