Browse Source

Merge pull request #548 from boandai/dev-1.1.0

delete nouse code
pull/2/head
easyscheduler 5 years ago committed by GitHub
parent
commit
16542210bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      escheduler-alert/src/main/java/cn/escheduler/alert/utils/FuncUtils.java
  2. 1
      escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java

5
escheduler-alert/src/main/java/cn/escheduler/alert/utils/FuncUtils.java

@ -22,10 +22,11 @@ public class FuncUtils {
StringBuilder sb = new StringBuilder();
boolean first = true;
for (String item : list) {
if (first)
if (first) {
first = false;
else
} else {
sb.append(split);
}
sb.append(item);
}
return sb.toString();

1
escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java

@ -312,7 +312,6 @@ public abstract class AbstractZKClient {
childrenList = zkClient.getChildren().forPath(masterZNodeParentPath);
}
} catch (Exception e) {
// logger.warn(e.getMessage());
if(!e.getMessage().contains("java.lang.IllegalStateException: instance must be started")){
logger.warn(e.getMessage(),e);
}

Loading…
Cancel
Save