Browse Source

Add option to not include hostname in default id.

pull/313/head
Spencer Gibb 7 years ago
parent
commit
f930208c2e
No known key found for this signature in database
GPG Key ID: 7788A47380690861
  1. 9
      spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java

9
spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java

@ -11,12 +11,19 @@ public class IdUtils { @@ -11,12 +11,19 @@ public class IdUtils {
private static final String SEPARATOR = ":";
public static String getDefaultInstanceId(PropertyResolver resolver) {
return getDefaultInstanceId(resolver, true);
}
public static String getDefaultInstanceId(PropertyResolver resolver, boolean includeHostname) {
String vcapInstanceId = resolver.getProperty("vcap.application.instance_id");
if (StringUtils.hasText(vcapInstanceId)) {
return vcapInstanceId;
}
String hostname = resolver.getProperty("spring.cloud.client.hostname");
String hostname = null;
if (includeHostname) {
hostname = resolver.getProperty("spring.cloud.client.hostname");
}
String appName = resolver.getProperty("spring.application.name");
String namePart = combineParts(hostname, SEPARATOR, appName);

Loading…
Cancel
Save