crabapples
/
Sentinel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transport: netty-http revert the default port to 80 of console.server and add unit test (#567)

This commit is contained in:
Jason Joo 2019-03-14 10:25:01 +08:00 committed by Eric Zhao
parent 1a482b1d9f
commit 78c0dd8f86
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sentinel-transport/sentinel-transport-netty-http/src/main/java/com/alibaba/csp/sentinel/transport/heartbeat/HttpHeartbeatSender.java
View File

@ -65,7 +65,7 @@ public class HttpHeartbeatSender implements HeartbeatSender {
} }
} }
private List<Tuple2<String, Integer>> parseDashboardList() { protected static List<Tuple2<String, Integer>> parseDashboardList() {
List<Tuple2<String, Integer>> list = new ArrayList<Tuple2<String, Integer>>(); List<Tuple2<String, Integer>> list = new ArrayList<Tuple2<String, Integer>>();
try { try {
String ipsStr = TransportConfig.getConsoleServer(); String ipsStr = TransportConfig.getConsoleServer();
@ -86,7 +86,7 @@ public class HttpHeartbeatSender implements HeartbeatSender {
continue; continue;
} }
String[] ipPort = ipPortStr.trim().split(":"); String[] ipPort = ipPortStr.trim().split(":");
int port = 8080; int port = 80;
if (ipPort.length > 1) { if (ipPort.length > 1) {
port = Integer.parseInt(ipPort[1].trim()); port = Integer.parseInt(ipPort[1].trim());
} }

58
sentinel-transport/sentinel-transport-netty-http/src/test/java/com/alibaba/csp/sentinel/transport/heartbeat/HttpHeartbeatSenderTest.java Normal file
View File

@ -0,0 +1,58 @@
package com.alibaba.csp.sentinel.transport.heartbeat;
import static org.junit.Assert.assertEquals;
import java.util.List;
import org.junit.Test;
import com.alibaba.csp.sentinel.config.SentinelConfig;
import com.alibaba.csp.sentinel.transport.config.TransportConfig;
import com.alibaba.csp.sentinel.util.function.Tuple2;
public class HttpHeartbeatSenderTest {
private void setAddr(String serverList) {
SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, serverList);
}
@Test
public void testAddr() {
setAddr("");
assertEquals(0, HttpHeartbeatSender.parseDashboardList().size());
setAddr("a.com");
List<Tuple2<String, Integer>> list = HttpHeartbeatSender.parseDashboardList();
assertEquals(1, list.size());
assertEquals("a.com", list.get(0).r1);
assertEquals(Integer.valueOf(80), list.get(0).r2);
setAddr("a.com:88");
list = HttpHeartbeatSender.parseDashboardList();
assertEquals(1, list.size());
assertEquals("a.com", list.get(0).r1);
assertEquals(Integer.valueOf(88), list.get(0).r2);
setAddr("a.com:88,,,,");
list = HttpHeartbeatSender.parseDashboardList();
assertEquals(1, list.size());
assertEquals("a.com", list.get(0).r1);
assertEquals(Integer.valueOf(88), list.get(0).r2);
setAddr("a.com:88,b.com");
list = HttpHeartbeatSender.parseDashboardList();
assertEquals(2, list.size());
assertEquals("a.com", list.get(0).r1);
assertEquals(Integer.valueOf(88), list.get(0).r2);
assertEquals("b.com", list.get(1).r1);
assertEquals(Integer.valueOf(80), list.get(1).r2);
setAddr("a.com:88,b.com:99999");
list = HttpHeartbeatSender.parseDashboardList();
assertEquals(2, list.size());
assertEquals("a.com", list.get(0).r1);
assertEquals(Integer.valueOf(88), list.get(0).r2);
assertEquals("b.com", list.get(1).r1);
assertEquals(Integer.valueOf(99999), list.get(1).r2);
}
}