You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by yi...@apache.org on 2018/08/02 07:00:11 UTC
[incubator-dubbo] branch 2.6.x updated: fix subscription when
enable monitor (#2166)
This is an automated email from the ASF dual-hosted git repository.
yiji pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 73d86a9 fix subscription when enable monitor (#2166)
73d86a9 is described below
commit 73d86a9d6eccf5270c30224f13331a89af26f17a
Author: jasonjoo2010 <hb...@163.com>
AuthorDate: Thu Aug 2 15:00:05 2018 +0800
fix subscription when enable monitor (#2166)
It looks good.
---
.../com/alibaba/dubbo/config/AbstractInterfaceConfig.java | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java
index 168bb10..87b50eb 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java
@@ -36,6 +36,8 @@ import com.alibaba.dubbo.rpc.ProxyFactory;
import com.alibaba.dubbo.rpc.cluster.Cluster;
import com.alibaba.dubbo.rpc.support.MockInvoker;
+import static com.alibaba.dubbo.common.utils.NetUtils.isInvalidLocalHost;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -225,7 +227,16 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
if (ConfigUtils.getPid() > 0) {
map.put(Constants.PID_KEY, String.valueOf(ConfigUtils.getPid()));
}
+ //set ip
+ String hostToRegistry = ConfigUtils.getSystemProperty(Constants.DUBBO_IP_TO_REGISTRY);
+ if (hostToRegistry == null || hostToRegistry.length() == 0) {
+ hostToRegistry = NetUtils.getLocalHost();
+ } else if (isInvalidLocalHost(hostToRegistry)) {
+ throw new IllegalArgumentException("Specified invalid registry ip from property:" + Constants.DUBBO_IP_TO_REGISTRY + ", value:" + hostToRegistry);
+ }
+ map.put(Constants.REGISTER_IP_KEY, hostToRegistry);
appendParameters(map, monitor);
+ appendParameters(map, application);
String address = monitor.getAddress();
String sysaddress = System.getProperty("dubbo.monitor.address");
if (sysaddress != null && sysaddress.length() > 0) {