zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Fury Zhu 2019-08-30 10:17:20 +08:00 committed by GitHub
commit 548354e77b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckProcessorDelegate.java
View File

@ -50,7 +50,7 @@ public class HealthCheckProcessorDelegate implements HealthCheckProcessor {
String type = task.getCluster().getHealthChecker().getType(); String type = task.getCluster().getHealthChecker().getType();
HealthCheckProcessor processor = healthCheckProcessorMap.get(type); HealthCheckProcessor processor = healthCheckProcessorMap.get(type);
if(processor == null){ if(processor == null){
processor = healthCheckProcessorMap.get("NONE"); processor = healthCheckProcessorMap.get(NoneHealthCheckProcessor.TYPE);
} }
processor.process(task); processor.process(task);

4
naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
View File

@ -47,6 +47,8 @@ import static com.alibaba.nacos.naming.misc.Loggers.SRV_LOG;
@Component @Component
public class HttpHealthCheckProcessor implements HealthCheckProcessor { public class HttpHealthCheckProcessor implements HealthCheckProcessor {
public static final String TYPE = "HTTP";
@Autowired @Autowired
private SwitchDomain switchDomain; private SwitchDomain switchDomain;
@ -79,7 +81,7 @@ public class HttpHealthCheckProcessor implements HealthCheckProcessor {
@Override @Override
public String getType() { public String getType() {
return "HTTP"; return TYPE;
} }
@Override @Override

4
naming/src/main/java/com/alibaba/nacos/naming/healthcheck/MysqlHealthCheckProcessor.java
View File

@ -45,6 +45,8 @@ import static com.alibaba.nacos.naming.misc.Loggers.SRV_LOG;
@Component @Component
public class MysqlHealthCheckProcessor implements HealthCheckProcessor { public class MysqlHealthCheckProcessor implements HealthCheckProcessor {
public static final String TYPE = "MYSQL";
@Autowired @Autowired
private HealthCheckCommon healthCheckCommon; private HealthCheckCommon healthCheckCommon;
@ -83,7 +85,7 @@ public class MysqlHealthCheckProcessor implements HealthCheckProcessor {
@Override @Override
public String getType() { public String getType() {
return "MYSQL"; return TYPE;
} }
@Override @Override

4
naming/src/main/java/com/alibaba/nacos/naming/healthcheck/NoneHealthCheckProcessor.java
View File

@ -26,12 +26,14 @@ import org.springframework.stereotype.Component;
@Component @Component
public class NoneHealthCheckProcessor implements HealthCheckProcessor { public class NoneHealthCheckProcessor implements HealthCheckProcessor {
public static final String TYPE = "NONE";
@Override @Override
public void process(HealthCheckTask task) { public void process(HealthCheckTask task) {
} }
@Override @Override
public String getType() { public String getType() {
return "NONE"; return TYPE;
} }
} }

4
naming/src/main/java/com/alibaba/nacos/naming/healthcheck/TcpSuperSenseProcessor.java
View File

@ -43,6 +43,8 @@ import static com.alibaba.nacos.naming.misc.Loggers.SRV_LOG;
@Component @Component
public class TcpSuperSenseProcessor implements HealthCheckProcessor, Runnable { public class TcpSuperSenseProcessor implements HealthCheckProcessor, Runnable {
public static final String TYPE = "TCP";
@Autowired @Autowired
private HealthCheckCommon healthCheckCommon; private HealthCheckCommon healthCheckCommon;
@ -420,6 +422,6 @@ public class TcpSuperSenseProcessor implements HealthCheckProcessor, Runnable {
@Override @Override
public String getType() { public String getType() {
return "TCP"; return TYPE;
} }
} }