You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/04/27 07:43:58 UTC
[incubator-servicecomb-java-chassis] branch master updated (20ff37b
-> 2dfcc09)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from 20ff37b SCB-515 change all config of 'cse.xxx' to 'servicecomb.xxx'
new b9e77b4 [SCB-518] ServiceCenter ip address need to config default port
new 85e80cf [SCB-518] ServiceCenter ip address need to config default port
new c2df776 [SCB-518] ServiceCenter ip address need to config default port
new 2dfcc09 [SCB-518] ServiceCenter ip address need to config default port
The 4 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:
.../org/apache/servicecomb/foundation/common/net/NetUtils.java | 2 +-
.../servicecomb/serviceregistry/config/ServiceRegistryConfig.java | 8 ++------
.../serviceregistry/config/TestServiceRegistryConfig.java | 8 +++++++-
3 files changed, 10 insertions(+), 8 deletions(-)
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.
[incubator-servicecomb-java-chassis] 03/04: [SCB-518] ServiceCenter
ip address need to config default port
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit c2df776648dd97a98ce0fed74b4cb967e6843765
Author: weichao666 <we...@huawei.com>
AuthorDate: Thu Apr 26 10:34:22 2018 +0800
[SCB-518] ServiceCenter ip address need to config default port
---
.../servicecomb/serviceregistry/config/TestServiceRegistryConfig.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
index f94dd78..9e15822 100644
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
@@ -20,7 +20,6 @@ package org.apache.servicecomb.serviceregistry.config;
import java.util.List;
import org.apache.commons.configuration.Configuration;
-import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.foundation.common.net.IpPort;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.AfterClass;
@@ -34,7 +33,7 @@ public class TestServiceRegistryConfig {
@BeforeClass
public static void initClass() {
ArchaiusUtils.resetConfig();
- ConfigUtil.installDynamicConfig();
+ ArchaiusUtils.setProperty("cse.service.registry.address", "http://127.0.0.1, https://127.0.0.1");
}
@AfterClass
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.
[incubator-servicecomb-java-chassis] 02/04: [SCB-518] ServiceCenter
ip address need to config default port
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 85e80cf17f08dd926e01db25d0137aeec363f9b6
Author: weichao666 <we...@huawei.com>
AuthorDate: Thu Apr 26 10:34:22 2018 +0800
[SCB-518] ServiceCenter ip address need to config default port
---
.../serviceregistry/config/ServiceRegistryConfig.java | 2 +-
.../serviceregistry/config/TestServiceRegistryConfig.java | 9 ++++++++-
service-registry/src/test/resources/microservice.yaml | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
index d125037..eb28ed7 100644
--- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
+++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
@@ -131,7 +131,7 @@ public final class ServiceRegistryConfig {
uriList.forEach(anUriList -> {
try {
URI uri = new URI(anUriList);
- this.ssl = uri.getScheme().startsWith("https");
+ this.ssl = "https".equals(uri.getScheme());
ipPortList.add(NetUtils.parseIpPort(uri.getScheme(), uri.getAuthority()));
} catch (Exception e) {
LOGGER.error("cse.service.registry.address invalid : {}", anUriList, e);
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
index 4cfa595..f94dd78 100644
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
@@ -17,7 +17,11 @@
package org.apache.servicecomb.serviceregistry.config;
+import java.util.List;
+
import org.apache.commons.configuration.Configuration;
+import org.apache.servicecomb.config.ConfigUtil;
+import org.apache.servicecomb.foundation.common.net.IpPort;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -30,6 +34,7 @@ public class TestServiceRegistryConfig {
@BeforeClass
public static void initClass() {
ArchaiusUtils.resetConfig();
+ ConfigUtil.installDynamicConfig();
}
@AfterClass
@@ -45,7 +50,6 @@ public class TestServiceRegistryConfig {
Assert.assertNotEquals(null, oConfig.getHeartbeatInterval());
Assert.assertEquals("HTTP_1_1", oConfig.getHttpVersion().name());
Assert.assertEquals("rest", oConfig.getTransport());
- Assert.assertNotEquals(null, oConfig.getIpPort());
Assert.assertEquals(1, oConfig.getWorkerPoolSize());
Assert.assertEquals(true, oConfig.isSsl());
Assert.assertEquals(30000, oConfig.getRequestTimeout());
@@ -57,6 +61,9 @@ public class TestServiceRegistryConfig {
Assert.assertEquals(ServiceRegistryConfig.NO_TENANT, oConfig.getTenantName());
Assert.assertEquals(null, oConfig.getSecretKey());
Assert.assertNull(ServiceRegistryConfig.INSTANCE.getMicroserviceVersionFactory());
+ List<IpPort> ipPorts = oConfig.getIpPort();
+ Assert.assertEquals("127.0.0.1:80", ipPorts.get(0).toString());
+ Assert.assertEquals("127.0.0.1:443", ipPorts.get(1).toString());
}
@Test
diff --git a/service-registry/src/test/resources/microservice.yaml b/service-registry/src/test/resources/microservice.yaml
index 4788355..0c9eb39 100644
--- a/service-registry/src/test/resources/microservice.yaml
+++ b/service-registry/src/test/resources/microservice.yaml
@@ -37,7 +37,7 @@ instance_description:
servicecomb:
service:
registry:
- address: http://127.0.0.1:30100
+ address: http://127.0.0.1, https://127.0.0.1
client:
httpVersion: HTTP_1_1
workerPoolSize: 1
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.
[incubator-servicecomb-java-chassis] 01/04: [SCB-518] ServiceCenter
ip address need to config default port
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit b9e77b4d82d76d3b1c38197b00c2eb8796cd7fa5
Author: weichao666 <we...@huawei.com>
AuthorDate: Thu Apr 26 10:34:22 2018 +0800
[SCB-518] ServiceCenter ip address need to config default port
---
.../java/org/apache/servicecomb/foundation/common/net/NetUtils.java | 2 +-
.../servicecomb/serviceregistry/config/ServiceRegistryConfig.java | 6 +-----
2 files changed, 2 insertions(+), 6 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 b7bac4d..8cf04d6 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
@@ -151,7 +151,7 @@ public final class NetUtils {
}
}
- private static IpPort parseIpPort(String scheme, String authority) {
+ public static IpPort parseIpPort(String scheme, String authority) {
if (authority == null)
return null;
int idx = authority.indexOf(':');
diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
index 175daba..d125037 100644
--- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
+++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
@@ -42,8 +42,6 @@ public final class ServiceRegistryConfig {
public static final ServiceRegistryConfig INSTANCE = new ServiceRegistryConfig();
- private static final int PROTOCOL_HTTP_PORT = 80;
-
private static final int DEFAULT_TIMEOUT_IN_MS = 30000;
private static final int DEFAULT_TIMEOUT_IN_SECONDS = 30;
@@ -133,10 +131,8 @@ public final class ServiceRegistryConfig {
uriList.forEach(anUriList -> {
try {
URI uri = new URI(anUriList);
- StringBuilder sb = new StringBuilder(uri.getHost());
- sb.append(':').append(uri.getPort() < 0 ? PROTOCOL_HTTP_PORT : uri.getPort());
this.ssl = uri.getScheme().startsWith("https");
- ipPortList.add(NetUtils.parseIpPort(sb.toString()));
+ ipPortList.add(NetUtils.parseIpPort(uri.getScheme(), uri.getAuthority()));
} catch (Exception e) {
LOGGER.error("cse.service.registry.address invalid : {}", anUriList, e);
}
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.
[incubator-servicecomb-java-chassis] 04/04: [SCB-518] ServiceCenter
ip address need to config default port
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 2dfcc09d5356767bfe4f934ae504d907bfb73ed8
Author: weichao666 <we...@huawei.com>
AuthorDate: Thu Apr 26 10:34:22 2018 +0800
[SCB-518] ServiceCenter ip address need to config default port
---
service-registry/src/test/resources/microservice.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/service-registry/src/test/resources/microservice.yaml b/service-registry/src/test/resources/microservice.yaml
index 0c9eb39..4788355 100644
--- a/service-registry/src/test/resources/microservice.yaml
+++ b/service-registry/src/test/resources/microservice.yaml
@@ -37,7 +37,7 @@ instance_description:
servicecomb:
service:
registry:
- address: http://127.0.0.1, https://127.0.0.1
+ address: http://127.0.0.1:30100
client:
httpVersion: HTTP_1_1
workerPoolSize: 1
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.