Add log for debugger

Issue-ID: HOLMES-50

Change-Id: I18a6397aa68f521bdce964a123ab0daebe09e4dd
Signed-off-by: youbowu <wu.youbo@zte.com.cn>

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 8b38419..0b3c81e 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
@@ -21,6 +21,7 @@ import java.io.IOException;
 import lombok.extern.slf4j.Slf4j;\r
 import org.apache.commons.lang3.StringUtils;\r
 import org.apache.http.HttpResponse;\r
+import org.apache.http.client.methods.HttpGet;\r
 import org.apache.http.client.methods.HttpPost;\r
 import org.apache.http.client.methods.HttpRequestBase;\r
 import org.apache.http.entity.ByteArrayEntity;\r
@@ -37,22 +38,22 @@ import org.openo.holmes.common.constant.AlarmConst;
 public class MSBRegisterUtil {\r
 \r
     public void register(ServiceRegisterEntity entity) throws IOException {\r
-            log.info("start inventory micro service register");\r
-            boolean flag = false;\r
-            int retry = 0;\r
-            while (!flag && retry < 20) {\r
-                log.info("inventory micro service register.retry:" + retry);\r
-                retry++;\r
-                flag = inner_register(entity);\r
-                if (!flag) {\r
-                    log.warn("micro service register failed, sleep 30S and try again.");\r
-                    threadSleep(30000);\r
-                } else {\r
-                    log.info("micro service register success!");\r
-                    break;\r
-                }\r
+        log.info("start inventory micro service register");\r
+        boolean flag = false;\r
+        int retry = 0;\r
+        while (!flag && retry < 20) {\r
+            log.info("holmes micro service register.retry:" + retry);\r
+            retry++;\r
+            flag = inner_register(entity);\r
+            if (!flag) {\r
+                log.warn("micro service register failed, sleep 30S and try again.");\r
+                threadSleep(30000);\r
+            } else {\r
+                log.info("micro service register success!");\r
+                break;\r
             }\r
-            log.info("holmes micro service register end.");\r
+        }\r
+        log.info("holmes micro service register end.");\r
     }\r
 \r
     private void setHeader(HttpRequestBase httpRequestBase) {\r
@@ -67,11 +68,14 @@ public class MSBRegisterUtil {
             ObjectMapper mapper = new ObjectMapper();\r
             String content = mapper.writeValueAsString(entity);\r
             HttpPost httpPost = new HttpPost(\r
-                    MicroServiceConfig.getMsbServerAddr() + "/api/microservices/v1/services?createOrUpdate=false");\r
+                    MicroServiceConfig.getMsbServerAddr() + "/api/microservices/v1/services?createOrUpdate=true");\r
+            HttpGet httpGet = new HttpGet(\r
+                    MicroServiceConfig.getMsbServerAddr() + "/api/microservices/v1/services/");\r
             if (StringUtils.isNotEmpty(content)) {\r
                 httpPost.setEntity(new ByteArrayEntity(content.getBytes()));\r
             }\r
             this.setHeader(httpPost);\r
+            this.setHeader(httpGet);\r
             HttpResponse response;\r
             try {\r
                 response = httpClient.execute(httpPost);\r
@@ -79,6 +83,16 @@ public class MSBRegisterUtil {
                 log.warn("Registering the service to the bus failure", e);\r
                 return false;\r
             }\r
+            HttpResponse responseGet = null;\r
+            try {\r
+                responseGet = httpClient.execute(httpPost);\r
+                log.info("all service:" + EntityUtils.toString(responseGet.getEntity()));\r
+            } catch (Exception e) {\r
+                if (responseGet != null) {\r
+                    log.info(responseGet.getStatusLine().getReasonPhrase());\r
+                }\r
+                log.warn("query all service failure", e);\r
+            }\r
             if (response.getStatusLine().getStatusCode() == AlarmConst.MICRO_SERVICE_STATUS_SUCCESS) {\r
                 log.info("Registration successful service to the bus :" + EntityUtils.toString(response.getEntity()));\r
                 return true;\r
@@ -89,12 +103,12 @@ public class MSBRegisterUtil {
                 return false;\r
             }\r
         } catch (IOException e) {\r
-            log.warn("ServiceRegisterEntity:" + entity + " parse failed",e);\r
+            log.warn("ServiceRegisterEntity:" + entity + " parse failed", e);\r
         } finally {\r
             try {\r
                 httpClient.close();\r
             } catch (IOException e) {\r
-                log.warn("At the time of registering service httpclient close failure",e);\r
+                log.warn("At the time of registering service httpclient close failure", e);\r
             }\r
         }\r
         return false;\r