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:47:15 UTC
[incubator-dubbo] branch master updated: fix subscription when
enable monitor (#2167)
This is an automated email from the ASF dual-hosted git repository.
yiji pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 584de00 fix subscription when enable monitor (#2167)
584de00 is described below
commit 584de00b4965c3e470686beafc659a9967b5bc78
Author: jasonjoo2010 <hb...@163.com>
AuthorDate: Thu Aug 2 15:47:00 2018 +0800
fix subscription when enable monitor (#2167)
---
.../java/org/apache/dubbo/config/AbstractInterfaceConfig.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index f27d1df..91a4a16 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -225,7 +225,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 (NetUtils.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) {