Add UT for actions

[holmes/common.git] / holmes-actions / src / main / java / org / openo / holmes / common / utils / MSBRegisterUtil.java

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 176107e..f7825e7 100644 (file)
--- 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,8 +19,6 @@ package org.openo.holmes.common.utils;
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
 import java.io.IOException;\r
 import lombok.extern.slf4j.Slf4j;\r
-import org.apache.http.client.methods.HttpRequestBase;\r
-import org.glassfish.jersey.client.ClientConfig;\r
 import org.jvnet.hk2.annotations.Service;\r
 import org.openo.holmes.common.api.entity.ServiceRegisterEntity;\r
 import org.openo.holmes.common.config.MicroServiceConfig;\r
@@ -37,7 +35,7 @@ public class MSBRegisterUtil {
         while (!flag && retry < 20) {\r
             log.info("Holmes microservice register. retry:" + retry);\r
             retry++;\r
-            flag = inner_register(entity);\r
+            flag = innerRegister(entity);\r
             if (!flag) {\r
                 log.warn("micro service register failed, sleep 30S and try again.");\r
                 threadSleep(30000);\r
@@ -49,14 +47,15 @@ public class MSBRegisterUtil {
         log.info("holmes micro service register end.");\r
     }\r
 \r
-    private boolean inner_register(ServiceRegisterEntity entity) {\r
-        ClientConfig config = new ClientConfig();\r
+    private boolean innerRegister(ServiceRegisterEntity entity) {\r
         try {\r
+            log.info("msbServerAddr:" + MicroServiceConfig.getMsbServerAddr());\r
+            log.info("entity:" + entity);\r
             MicroserviceBusRest resourceserviceproxy = ConsumerFactory.createConsumer(\r
-                    MicroServiceConfig.getMsbServerAddr(), config, MicroserviceBusRest.class);\r
+                    MicroServiceConfig.getMsbServerAddr(), MicroserviceBusRest.class);\r
             resourceserviceproxy.registerServce("false", entity);\r
         } catch (Exception error) {\r
-            log.error("microservice register failed!" + error.getMessage());\r
+            log.error("microservice register failed!" + error.getMessage(), error);\r
             return false;\r
         }\r
         return true;\r
@@ -67,7 +66,7 @@ public class MSBRegisterUtil {
         try {\r
             Thread.sleep(second);\r
         } catch (InterruptedException error) {\r
-            log.error("thread sleep error.errorMsg:" + error.getMessage());\r
+            log.error("thread sleep error.errorMsg:" + error.getMessage(), error);\r
         }\r
         log.info("sleep end .");\r
     }\r