You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/04/20 07:55:44 UTC
[incubator-servicecomb-java-chassis] branch master updated (8a5b972
-> 96c84b6)
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from 8a5b972 SCB-507 avoid rest publisher get NaN values when there is no period publisher
new 63b00f5 [SCB-498] Configuration Center ip address need to config default port
new 2de2ffe [SCB-498] when use ip address, need to config default port
new 42efeb0 modify
new e0c1ca2 Delete sh.exe.stackdump
new 96c84b6 fix ut
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../servicecomb/foundation/common/net/NetUtils.java | 15 ++++++++++++++-
.../servicecomb/foundation/common/net/TestNetUtils.java | 10 +++++++---
2 files changed, 21 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 04/05: Delete sh.exe.stackdump
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit e0c1ca200686b078ffa9c78daa0be8e79bf8bbaf
Author: weichao <30...@users.noreply.github.com>
AuthorDate: Fri Apr 20 09:16:19 2018 +0800
Delete sh.exe.stackdump
---
sh.exe.stackdump | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/sh.exe.stackdump b/sh.exe.stackdump
deleted file mode 100644
index 7b838f8..0000000
--- a/sh.exe.stackdump
+++ /dev/null
@@ -1,11 +0,0 @@
-Stack trace:
-Frame Function Args
-001802FF170 0018005D14E (0018022B7F0, 0018021DC39, 001802FF170, 000FFFFB9F0)
-001802FF170 00180046609 (00000000002, 00000000003, 00000000002, 000C0000000)
-001802FF170 00180046642 (00000000002, 001802FF480, 001802FF170, 00000000008)
-001802FF170 00180057602 (00000000000, 000FFFFCC35, 000FFFFCC53, 0018021C490)
-000FFFFCCB0 001800576B0 (645C655C725C635C, 695C745C6E5C655C, 775C2D5C6C5C615C, 725C635C6E5C695C)
-000FFFFCCB0 00180046DA5 (00000000000, 00000000000, 00000000000, 00000000000)
-00000000000 00180045873 (00000000000, 00000000000, 00000000000, 00000000000)
-000FFFFFFF0 00180045924 (00000000000, 00000000000, 00000000000, 00000000000)
-End of stack trace
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 05/05: fix ut
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 96c84b6601c5b85946c62b69e11dd147a24c7fb6
Author: weichao <30...@users.noreply.github.com>
AuthorDate: Fri Apr 20 09:30:33 2018 +0800
fix ut
---
.../servicecomb/foundation/common/net/TestNetUtils.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
index 654f543..85eebe2 100644
--- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
+++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
@@ -46,13 +46,13 @@ public class TestNetUtils {
Assert.assertEquals(8080, NetUtils.parseIpPort("127.0.0.1:8080").getPort());
Assert.assertEquals(null, NetUtils.parseIpPort(null));
Assert.assertEquals(null, NetUtils.parseIpPort("127.0.0.18080"));
- Assert.assertEquals(NetUtils.parseIpPortFromURI(null), null);
- Assert.assertEquals(NetUtils.parseIpPortFromURI("ss"), null);
- Assert.assertEquals(NetUtils.parseIpPortFromURI("rest://127.0.0.1:8080").getHostOrIp(), "127.0.0.1");
- Assert.assertEquals(NetUtils.parseIpPortFromURI("http://127.0.0.1:8080").getPort(), 8080);
- Assert.assertEquals(NetUtils.parseIpPortFromURI("http://127.0.0.1").getPort(), 80);
- Assert.assertEquals(NetUtils.parseIpPortFromURI("https://127.0.0.1:8080").getPort(), 8080);
- Assert.assertEquals(NetUtils.parseIpPortFromURI("https://127.0.0.1").getPort(), 443);
+ Assert.assertEquals(null, NetUtils.parseIpPortFromURI(null));
+ Assert.assertEquals(null, NetUtils.parseIpPortFromURI("ss"));
+ Assert.assertEquals("127.0.0.1", NetUtils.parseIpPortFromURI("rest://127.0.0.1:8080").getHostOrIp());
+ Assert.assertEquals(8080, NetUtils.parseIpPortFromURI("http://127.0.0.1:8080").getPort());
+ Assert.assertEquals(80, NetUtils.parseIpPortFromURI("http://127.0.0.1").getPort());
+ Assert.assertEquals(8080, NetUtils.parseIpPortFromURI("https://127.0.0.1:8080").getPort());
+ Assert.assertEquals(443, NetUtils.parseIpPortFromURI("https://127.0.0.1").getPort());
}
@Test
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 01/05: [SCB-498] Configuration
Center ip address need to config default port
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 63b00f5592c0554ab1a0dc99764c5346d3d1d454
Author: weichao666 <we...@huawei.com>
AuthorDate: Tue Apr 17 17:30:36 2018 +0800
[SCB-498] Configuration Center ip address need to config default port
---
.../apache/servicecomb/config/client/ConfigCenterConfig.java | 12 +++++++++++-
.../servicecomb/config/client/TestConfigCenterConfig.java | 2 ++
.../config-cc/src/test/resources/microservice.yaml | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
index c38f252..42b1c28 100644
--- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
+++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
@@ -175,11 +175,21 @@ public final class ConfigCenterConfig {
String[] result = finalConfig.getStringArray(SERVER_URL_KEY);
List<String> configCenterUris = new ArrayList<>(result.length);
for (int i = 0; i < result.length; i++) {
- configCenterUris.add(result[i]);
+ if (!result[i].substring(result[i].indexOf(":") + 1, result[i].length()).contains(":")) {
+ configCenterUris.add(useDefaultPort(result[i]));
+ } else {
+ configCenterUris.add(result[i]);
+ }
}
return configCenterUris;
}
+ private String useDefaultPort(String result) {
+ if (result.startsWith("https"))
+ return new StringBuffer(result).append(":443").toString();
+ return new StringBuffer(result).append(":80").toString();
+ }
+
public boolean getAutoDiscoveryEnabled() {
return finalConfig.getBoolean(AUTO_DISCOVERY_ENABLED, false);
}
diff --git a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
index 1624f5a..d09e4af 100644
--- a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
+++ b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
@@ -35,6 +35,8 @@ public class TestConfigCenterConfig {
List<String> servers = ConfigCenterConfig.INSTANCE.getServerUri();
Assert.assertEquals("https://172.16.8.7:30103", servers.get(0));
Assert.assertEquals("https://172.16.8.7:30103", servers.get(1));
+ Assert.assertEquals("http://172.16.8.7:80", servers.get(2));
+ Assert.assertEquals("https://172.16.8.7:443", servers.get(3));
}
@Test
diff --git a/dynamic-config/config-cc/src/test/resources/microservice.yaml b/dynamic-config/config-cc/src/test/resources/microservice.yaml
index 445cfa6..4452250 100644
--- a/dynamic-config/config-cc/src/test/resources/microservice.yaml
+++ b/dynamic-config/config-cc/src/test/resources/microservice.yaml
@@ -46,7 +46,7 @@ cse:
config:
client:
serviceName: testDemo
- serverUri: https://172.16.8.7:30103,https://${host.name}:30103
+ serverUri: https://172.16.8.7:30103,https://${host.name}:30103,http://172.16.8.7,https://172.16.8.7
tenantName: csetest
refreshMode: 1
refresh_interval: 10000
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 03/05: modify
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 42efeb038a1de6aac968d84c058764f3b2fdf2b8
Author: weichao666 <we...@huawei.com>
AuthorDate: Thu Apr 19 19:54:24 2018 +0800
modify
---
.../apache/servicecomb/foundation/common/net/NetUtils.java | 6 +++---
sh.exe.stackdump | 11 +++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
index 66b5181..b7bac4d 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
@@ -158,10 +158,10 @@ public final class NetUtils {
if (idx != -1)
return parseIpPort(authority);
if (scheme.equals("http"))
- return parseIpPort(new StringBuffer(authority).append(":80").toString());
+ return new IpPort(authority, 80);
if (scheme.equals("https"))
- return parseIpPort(new StringBuffer(authority).append(":443").toString());
- return parseIpPort(authority);
+ return new IpPort(authority, 443);
+ return null;
}
/**
diff --git a/sh.exe.stackdump b/sh.exe.stackdump
new file mode 100644
index 0000000..7b838f8
--- /dev/null
+++ b/sh.exe.stackdump
@@ -0,0 +1,11 @@
+Stack trace:
+Frame Function Args
+001802FF170 0018005D14E (0018022B7F0, 0018021DC39, 001802FF170, 000FFFFB9F0)
+001802FF170 00180046609 (00000000002, 00000000003, 00000000002, 000C0000000)
+001802FF170 00180046642 (00000000002, 001802FF480, 001802FF170, 00000000008)
+001802FF170 00180057602 (00000000000, 000FFFFCC35, 000FFFFCC53, 0018021C490)
+000FFFFCCB0 001800576B0 (645C655C725C635C, 695C745C6E5C655C, 775C2D5C6C5C615C, 725C635C6E5C695C)
+000FFFFCCB0 00180046DA5 (00000000000, 00000000000, 00000000000, 00000000000)
+00000000000 00180045873 (00000000000, 00000000000, 00000000000, 00000000000)
+000FFFFFFF0 00180045924 (00000000000, 00000000000, 00000000000, 00000000000)
+End of stack trace
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 02/05: [SCB-498] when use ip
address, need to config default port
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 2de2ffed23481c099b3610e4a72aeee9f85dcd31
Author: weichao666 <we...@huawei.com>
AuthorDate: Thu Apr 19 09:46:07 2018 +0800
[SCB-498] when use ip address, need to config default port
---
.../servicecomb/config/client/ConfigCenterConfig.java | 12 +-----------
.../servicecomb/config/client/TestConfigCenterConfig.java | 2 --
.../config-cc/src/test/resources/microservice.yaml | 2 +-
.../servicecomb/foundation/common/net/NetUtils.java | 15 ++++++++++++++-
.../servicecomb/foundation/common/net/TestNetUtils.java | 4 ++++
5 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
index 42b1c28..c38f252 100644
--- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
+++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
@@ -175,21 +175,11 @@ public final class ConfigCenterConfig {
String[] result = finalConfig.getStringArray(SERVER_URL_KEY);
List<String> configCenterUris = new ArrayList<>(result.length);
for (int i = 0; i < result.length; i++) {
- if (!result[i].substring(result[i].indexOf(":") + 1, result[i].length()).contains(":")) {
- configCenterUris.add(useDefaultPort(result[i]));
- } else {
- configCenterUris.add(result[i]);
- }
+ configCenterUris.add(result[i]);
}
return configCenterUris;
}
- private String useDefaultPort(String result) {
- if (result.startsWith("https"))
- return new StringBuffer(result).append(":443").toString();
- return new StringBuffer(result).append(":80").toString();
- }
-
public boolean getAutoDiscoveryEnabled() {
return finalConfig.getBoolean(AUTO_DISCOVERY_ENABLED, false);
}
diff --git a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
index d09e4af..1624f5a 100644
--- a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
+++ b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
@@ -35,8 +35,6 @@ public class TestConfigCenterConfig {
List<String> servers = ConfigCenterConfig.INSTANCE.getServerUri();
Assert.assertEquals("https://172.16.8.7:30103", servers.get(0));
Assert.assertEquals("https://172.16.8.7:30103", servers.get(1));
- Assert.assertEquals("http://172.16.8.7:80", servers.get(2));
- Assert.assertEquals("https://172.16.8.7:443", servers.get(3));
}
@Test
diff --git a/dynamic-config/config-cc/src/test/resources/microservice.yaml b/dynamic-config/config-cc/src/test/resources/microservice.yaml
index 4452250..445cfa6 100644
--- a/dynamic-config/config-cc/src/test/resources/microservice.yaml
+++ b/dynamic-config/config-cc/src/test/resources/microservice.yaml
@@ -46,7 +46,7 @@ cse:
config:
client:
serviceName: testDemo
- serverUri: https://172.16.8.7:30103,https://${host.name}:30103,http://172.16.8.7,https://172.16.8.7
+ serverUri: https://172.16.8.7:30103,https://${host.name}:30103
tenantName: csetest
refreshMode: 1
refresh_interval: 10000
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
index 3fbee27..66b5181 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
@@ -145,12 +145,25 @@ public final class NetUtils {
try {
URI uri = new URI(uriAddress);
String authority = uri.getAuthority();
- return parseIpPort(authority);
+ return parseIpPort(uri.getScheme(), authority);
} catch (URISyntaxException e) {
return null;
}
}
+ private static IpPort parseIpPort(String scheme, String authority) {
+ if (authority == null)
+ return null;
+ int idx = authority.indexOf(':');
+ if (idx != -1)
+ return parseIpPort(authority);
+ if (scheme.equals("http"))
+ return parseIpPort(new StringBuffer(authority).append(":80").toString());
+ if (scheme.equals("https"))
+ return parseIpPort(new StringBuffer(authority).append(":443").toString());
+ return parseIpPort(authority);
+ }
+
/**
* 对于配置为0.0.0.0的地址，let it go
* schema, e.g. http
diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
index ce6cc08..654f543 100644
--- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
+++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
@@ -49,6 +49,10 @@ public class TestNetUtils {
Assert.assertEquals(NetUtils.parseIpPortFromURI(null), null);
Assert.assertEquals(NetUtils.parseIpPortFromURI("ss"), null);
Assert.assertEquals(NetUtils.parseIpPortFromURI("rest://127.0.0.1:8080").getHostOrIp(), "127.0.0.1");
+ Assert.assertEquals(NetUtils.parseIpPortFromURI("http://127.0.0.1:8080").getPort(), 8080);
+ Assert.assertEquals(NetUtils.parseIpPortFromURI("http://127.0.0.1").getPort(), 80);
+ Assert.assertEquals(NetUtils.parseIpPortFromURI("https://127.0.0.1:8080").getPort(), 8080);
+ Assert.assertEquals(NetUtils.parseIpPortFromURI("https://127.0.0.1").getPort(), 443);
}
@Test
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.