Skip to content

Commit 73d86a9

Browse files
jasonjoo2010zonghaishang
authored andcommitted
fix subscription when enable monitor (#2166)
It looks good.
1 parent 79859aa commit 73d86a9

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
import com.alibaba.dubbo.rpc.cluster.Cluster;
3737
import com.alibaba.dubbo.rpc.support.MockInvoker;
3838

39+
import static com.alibaba.dubbo.common.utils.NetUtils.isInvalidLocalHost;
40+
3941
import java.util.ArrayList;
4042
import java.util.HashMap;
4143
import java.util.List;
@@ -225,7 +227,16 @@ protected URL loadMonitor(URL registryURL) {
225227
if (ConfigUtils.getPid() > 0) {
226228
map.put(Constants.PID_KEY, String.valueOf(ConfigUtils.getPid()));
227229
}
230+
//set ip
231+
String hostToRegistry = ConfigUtils.getSystemProperty(Constants.DUBBO_IP_TO_REGISTRY);
232+
if (hostToRegistry == null || hostToRegistry.length() == 0) {
233+
hostToRegistry = NetUtils.getLocalHost();
234+
} else if (isInvalidLocalHost(hostToRegistry)) {
235+
throw new IllegalArgumentException("Specified invalid registry ip from property:" + Constants.DUBBO_IP_TO_REGISTRY + ", value:" + hostToRegistry);
236+
}
237+
map.put(Constants.REGISTER_IP_KEY, hostToRegistry);
228238
appendParameters(map, monitor);
239+
appendParameters(map, application);
229240
String address = monitor.getAddress();
230241
String sysaddress = System.getProperty("dubbo.monitor.address");
231242
if (sysaddress != null && sysaddress.length() > 0) {

0 commit comments

Comments
 (0)