[servicecomb-pack] branch master updated: SCB-1125 fixed Add omega instanceid to properties (#388)

[ningjiang]

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git


The following commit(s) were added to refs/heads/master by this push:
     new caf06ce  SCB-1125 fixed Add omega instanceid to properties (#388)
caf06ce is described below

commit caf06cef7d8ac16edee7b15c5831be8d690a8d69
Author: Lei Zhang <coolbee...@gmail.com>
AuthorDate: Tue Jan 22 11:50:13 2019 +0800

    SCB-1125 fixed Add omega instanceid to properties (#388)
    
    * Add omega instanceid to properties
    
    * modify omega instanceid key to omega.instance.instanceId
---
 .../servicecomb/pack/omega/context/ServiceConfig.java    | 16 ++++++++++++----
 .../servicecomb/pack/omega/spring/OmegaSpringConfig.java |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git 
a/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/ServiceConfig.java
 
b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/ServiceConfig.java
index 044b87d..09024e6 100644
--- 
a/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/ServiceConfig.java
+++ 
b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/ServiceConfig.java
@@ -25,11 +25,19 @@ public class ServiceConfig {
   private final String instanceId;
 
   public ServiceConfig(String serviceName) {
+    this(serviceName,null);
+  }
+
+  public ServiceConfig(String serviceName,String instanceId) {
     this.serviceName = serviceName;
-    try {
-      instanceId = serviceName + "-" + 
InetAddress.getLocalHost().getHostAddress();
-    } catch (UnknownHostException e) {
-      throw new IllegalStateException(e);
+    if(instanceId == null || "".equalsIgnoreCase(instanceId.trim())){
+      try {
+        this.instanceId = serviceName + "-" + 
InetAddress.getLocalHost().getHostAddress();
+      } catch (UnknownHostException e) {
+        throw new IllegalStateException(e);
+      }
+    }else{
+      this.instanceId = instanceId;
     }
   }
 
diff --git 
a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
 
b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
index 29406bc..18e3ed1 100644
--- 
a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
+++ 
b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
@@ -68,8 +68,8 @@ class OmegaSpringConfig {
   }
 
   @Bean
-  ServiceConfig serviceConfig(@Value("${spring.application.name}") String 
serviceName) {
-    return new ServiceConfig(serviceName);
+  ServiceConfig serviceConfig(@Value("${spring.application.name}") String 
serviceName, @Value("${omega.instance.instanceId:#{null}}") String instanceId) {
+    return new ServiceConfig(serviceName,instanceId);
   }
 
   @Bean