X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fopeno%2Fholmes%2Fcommon%2Futils%2FMSBRegisterUtil.java;h=904a853a93afe7cfb5168febc4cca8ff2dac270c;hb=ee93748a3535926dface4f2fa5c99f35fd9cf5d0;hp=e18a15ccf02586af6b597dd60ab49551c9415eea;hpb=e9d903e5f0c762e11d443994eac2ced51afbe3e3;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java b/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java
index e18a15c..904a853 100644
--- a/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java
@@ -19,7 +19,6 @@ package org.openo.holmes.common.utils;
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 import java.io.IOException;
 import lombok.extern.slf4j.Slf4j;
-import org.glassfish.jersey.client.ClientConfig;
 import org.jvnet.hk2.annotations.Service;
 import org.openo.holmes.common.api.entity.ServiceRegisterEntity;
 import org.openo.holmes.common.config.MicroServiceConfig;
@@ -36,7 +35,7 @@ public class MSBRegisterUtil {
         while (!flag && retry < 20) {
             log.info("Holmes microservice register. retry:" + retry);
             retry++;
-            flag = inner_register(entity);
+            flag = innerRegister(entity);
             if (!flag) {
                 log.warn("micro service register failed, sleep 30S and try again.");
                 threadSleep(30000);
@@ -48,16 +47,15 @@ public class MSBRegisterUtil {
         log.info("holmes micro service register end.");
     }
 
-    private boolean inner_register(ServiceRegisterEntity entity) {
-        ClientConfig config = new ClientConfig();
+    private boolean innerRegister(ServiceRegisterEntity entity) {
         try {
             log.info("msbServerAddr:" + MicroServiceConfig.getMsbServerAddr());
             log.info("entity:" + entity);
             MicroserviceBusRest resourceserviceproxy = ConsumerFactory.createConsumer(
-                    MicroServiceConfig.getMsbServerAddr(), config, MicroserviceBusRest.class);
+                    MicroServiceConfig.getMsbServerAddr(), MicroserviceBusRest.class);
             resourceserviceproxy.registerServce("false", entity);
         } catch (Exception error) {
-            log.error("microservice register failed!" + error.getMessage());
+            log.error("microservice register failed!" + error.getMessage(), error);
             return false;
         }
         return true;
@@ -68,7 +66,8 @@ public class MSBRegisterUtil {
         try {
             Thread.sleep(second);
         } catch (InterruptedException error) {
-            log.error("thread sleep error.errorMsg:" + error.getMessage());
+            log.error("thread sleep error.errorMsg:" + error.getMessage(), error);
+            Thread.currentThread().interrupt();
         }
         log.info("sleep end .");
     }