فهرست منبع

add 规则引擎集群

18339543638 4 سال پیش
والد
کامیت
2acbfb4283

+ 2 - 4
jetlinks-components/rule-engine-component/src/main/java/org/jetlinks/community/rule/engine/cluster/ClusterUniqueTask.java

@@ -146,7 +146,7 @@ class ClusterUniqueTask implements Task ,Serializable{
 
     private Mono<Void> init(){
         return generatePingMsg()
-            .concatWith(this.handlePingMsg())
+            .mergeWith(this.handlePingMsg())
             .then();
 
     }
@@ -172,8 +172,6 @@ class ClusterUniqueTask implements Task ,Serializable{
                         }
                     });
                     return false;
-                }else if(lock.isLocked()&&lock.isHeldByThread(new Thread().getId())){
-                    return false;
                 }
                 return true;
             })
@@ -188,7 +186,7 @@ class ClusterUniqueTask implements Task ,Serializable{
                     }
                 });
 
-                if(isReplica()){
+                if(!isReplica()){
                     if(State.running.equals(taskState)&&!State.running.equals(executor.getState())){
                         executor.start();
                     }