You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by il...@apache.org on 2019/09/05 13:12:12 UTC
[dubbo] branch master updated: fix protocol register set false not
work (#4776)
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 8798d38 fix protocol register set false not work (#4776)
8798d38 is described below
commit 8798d3852ed0e9e82f037e89f9b8cd8b96a17e49
Author: Taosheng Wei <ts...@163.com>
AuthorDate: Thu Sep 5 21:11:58 2019 +0800
fix protocol register set false not work (#4776)
---
.../java/org/apache/dubbo/config/AbstractServiceConfig.java | 2 +-
.../src/main/java/org/apache/dubbo/config/Constants.java | 2 ++
.../main/java/org/apache/dubbo/config/ServiceConfig.java | 13 +++++++++----
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
index 8aff2aa..f1c3a28 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
@@ -104,7 +104,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig {
/**
* Whether to register
*/
- private Boolean register = true;
+ private Boolean register;
/**
* Warm up period
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java
index 09a9f02..97b0b93 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java
@@ -114,4 +114,6 @@ public interface Constants {
String REGISTRIES_SUFFIX = "dubbo.registries.";
String ZOOKEEPER_PROTOCOL = "zookeeper";
+
+ String REGISTER_KEY = "register";
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 19f83cc..07945ad 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -75,6 +75,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_IP_TO_BIND
import static org.apache.dubbo.config.Constants.DUBBO_IP_TO_REGISTRY;
import static org.apache.dubbo.config.Constants.DUBBO_PORT_TO_BIND;
import static org.apache.dubbo.config.Constants.DUBBO_PORT_TO_REGISTRY;
+import static org.apache.dubbo.config.Constants.REGISTER_KEY;
import static org.apache.dubbo.rpc.cluster.Constants.EXPORT_KEY;
import static org.apache.dubbo.config.Constants.MULTICAST;
import static org.apache.dubbo.config.Constants.PROTOCOLS_SUFFIX;
@@ -577,9 +578,6 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
// export to remote if the config is not local (export to local only when config is local)
if (!SCOPE_LOCAL.equalsIgnoreCase(scope)) {
- if (!isOnlyInJvm() && logger.isInfoEnabled()) {
- logger.info("Export dubbo service " + interfaceClass.getName() + " to url " + url);
- }
if (CollectionUtils.isNotEmpty(registryURLs)) {
for (URL registryURL : registryURLs) {
//if protocol is only injvm ,not register
@@ -592,7 +590,11 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
url = url.addParameterAndEncoded(MONITOR_KEY, monitorUrl.toFullString());
}
if (logger.isInfoEnabled()) {
- logger.info("Register dubbo service " + interfaceClass.getName() + " url " + url + " to registry " + registryURL);
+ if (url.getParameter(REGISTER_KEY, true)) {
+ logger.info("Register dubbo service " + interfaceClass.getName() + " url " + url + " to registry " + registryURL);
+ } else {
+ logger.info("Export dubbo service " + interfaceClass.getName() + " to url " + url);
+ }
}
// For providers, this is used to enable custom proxy to generate invoker
@@ -608,6 +610,9 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
exporters.add(exporter);
}
} else {
+ if (logger.isInfoEnabled()) {
+ logger.info("Export dubbo service " + interfaceClass.getName() + " to url " + url);
+ }
Invoker<?> invoker = PROXY_FACTORY.getInvoker(ref, (Class) interfaceClass, url);
DelegateProviderMetaDataInvoker wrapperInvoker = new DelegateProviderMetaDataInvoker(invoker, this);