SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #123 from zanella/use_getFirstNonLoopbackAddress_from_commons

Browse Source 
Use getFirstNonLoopbackAddress() from cloud commons
This commit is contained in:
Spencer Gibb
2015-12-17 12:46:50 -07:00
parent ebe9dcb558 6706738be9
commit 148e80b6bb
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.consul.discovery;
import static org.springframework.cloud.consul.discovery.IpAddressUtils.getFirstNonLoopbackAddress;
import static org.springframework.cloud.util.InetUtils.getFirstNonLoopbackAddress;
import java.net.InetAddress;
import java.util.ArrayList;

23
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/IpAddressUtils.java
View File

@@ -43,27 +43,4 @@ public class IpAddressUtils {
}
return service.getNode();
}
@SneakyThrows
public static InetAddress getFirstNonLoopbackAddress() {
try {
for (Enumeration<NetworkInterface> enumNic = NetworkInterface.getNetworkInterfaces();
enumNic.hasMoreElements(); ) {
NetworkInterface ifc = enumNic.nextElement();
if (ifc.isUp()) {
for (Enumeration<InetAddress> enumAddr = ifc.getInetAddresses();
enumAddr.hasMoreElements(); ) {
InetAddress address = enumAddr.nextElement();
if (address instanceof Inet4Address && !address.isLoopbackAddress()) {
return address;
}
}
}
}
}
catch (IOException ex) {
log.error("Cannot get host info", ex);
}
return InetAddress.getLocalHost();
}
}