[issue #142] log optimization/ fix typo (#143)

huaweicloud · Feb 26, 2020 · 26e7c9f · 26e7c9f
1 parent 6b0e321
commit 26e7c9f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 35 deletions.
diff --git a/...ud-huawei-config/src/main/java/com/huaweicloud/config/client/ServiceCombConfigClient.java b/...ud-huawei-config/src/main/java/com/huaweicloud/config/client/ServiceCombConfigClient.java
@@ -131,8 +131,8 @@ public Map<String, String> loadFromConfigCenter(String dimensionsInfo, String pr
         return Collections.emptyMap();
       }
       throw new RemoteOperationException(
-          "read response failed. status=" + response.getStatusCode() + ";message=" + response
-              .getStatusMessage());
+          "read response failed. status:" + response.getStatusCode() + "; message:" + response
+              .getStatusMessage() + "; content:" + response.getContent());
 
     } catch (RemoteServerUnavailableException e) {
       configCenterConfig.toggle();
@@ -178,8 +178,8 @@ public Map<String, String> loadFromKie(ServiceCombConfigProperties serviceCombCo
         return result;
       } else {
         throw new RemoteOperationException(
-            "read response failed. status=" + response.getStatusCode() + ";mesage=" + response
-                .getStatusMessage());
+            "read response failed. status:" + response.getStatusCode() + "; message:" + response
+                .getStatusMessage() + "; content:" + response.getContent());
       }
     } catch (Exception e) {
       configCenterConfig.toggle();
@@ -207,7 +207,7 @@ public boolean updateToKie(ServiceCombConfigProperties serviceCombConfigProperti
         return true;
       } else {
         LOGGER.error(
-            "create keyValue fails, responseStatusCode={}, responseMessage={}, responseContent{}",
+            "create keyValue fails, responseStatusCode:{}, responseMessage:{}, responseContent:{}",
             response.getStatusCode(), response.getStatusMessage(), response.getContent());
         return false;
       }

diff --git a/...huaweicloud/sample/DiscoveryBoostrap.java → ...uaweicloud/sample/DiscoveryBootstrap.java b/...huaweicloud/sample/DiscoveryBoostrap.java → ...uaweicloud/sample/DiscoveryBootstrap.java
@@ -10,7 +10,7 @@
  * @Date 2020/1/11
  **/
 @Component
-public class DiscoveryBoostrap {
+public class DiscoveryBootstrap {
 
   @Autowired(required = false)
   private ServiceCombAutoServiceRegistration registration;

diff --git a/...scovery/src/main/java/com/huaweicloud/servicecomb/discovery/client/ServiceCombClient.java b/...scovery/src/main/java/com/huaweicloud/servicecomb/discovery/client/ServiceCombClient.java
@@ -70,7 +70,7 @@ public class ServiceCombClient {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ServiceCombClient.class);
 
-  URLConfig registryConfig = new URLConfig();
+  private URLConfig registryConfig = new URLConfig();
 
   private AtomicBoolean initSuccess = new AtomicBoolean(true);
 
@@ -123,13 +123,11 @@ public MicroserviceInstancesResponse getServiceCenterInstances()
         return result;
       }
       throw new RemoteOperationException(
-          "read response failed. status=" + response.getStatusCode() + ";message=" + response
-              .getStatusMessage());
+          "read response failed. status:" + response.getStatusCode() + "; message:" + response
+              .getStatusMessage() + "; content:" + response.getContent());
     } catch (URISyntaxException e) {
       throw new RemoteOperationException("build url failed.", e);
-    } catch (IOException e) {
-      handleRemoteOperationException(response, e);
-    } catch (RemoteServerUnavailableException e) {
+    } catch (IOException | RemoteServerUnavailableException e) {
       handleRemoteOperationException(response, e);
     }
     return null;
@@ -161,8 +159,8 @@ public String registerMicroservice(Microservice microservice) throws ServiceComb
         }
       } else {
         throw new RemoteOperationException(
-            "read response failed. status=" + response.getStatusCode() + ";message=" + response
-                .getStatusMessage());
+            "read response failed. status:" + response.getStatusCode() + "; message:" + response
+                .getStatusMessage() + "; content:" + response.getContent());
       }
     } catch (URISyntaxException e) {
       throw new RemoteOperationException("build url failed.", e);
@@ -194,8 +192,8 @@ public String getServiceId(Microservice microservice) throws ServiceCombExceptio
         return null;
       } else {
         throw new RemoteOperationException(
-            "read response failed. status=" + response.getStatusCode() + ";message=" + response
-                .getStatusMessage());
+            "read response failed. status:" + response.getStatusCode() + "; message:" + response
+                .getStatusMessage() + "; content:" + response.getContent());
       }
     } catch (URISyntaxException e) {
       throw new RemoteOperationException("build url failed.", e);
@@ -230,9 +228,9 @@ public String registerInstance(MicroserviceInstance microserviceInstance)
         return result.get("instanceId");
       } else {
         throw new RemoteOperationException(
-            "read response failed. url=" + formatUrl + "status=" + response.getStatusCode()
-                + ";message=" + response
-                .getStatusMessage());
+            "read response failed. url:" + formatUrl + "status:" + response.getStatusCode()
+                + "; message:" + response.getStatusMessage() + "; content:" + response
+                .getContent());
       }
     } catch (URISyntaxException e) {
       throw new RemoteOperationException("build url failed.", e);
@@ -262,9 +260,9 @@ public boolean deRegisterInstance(String serviceId, String instanceId)
         return true;
       } else {
         throw new RemoteOperationException(
-            "deRegister failed. url=" + formatUrl + "status=" + response.getStatusCode()
-                + ";message=" + response
-                .getStatusMessage());
+            "deRegister failed. url:" + formatUrl + "status:" + response.getStatusCode()
+                + "; message:" + response.getStatusMessage() + "; content:" + response
+                .getContent());
       }
     } catch (URISyntaxException e) {
       throw new RemoteOperationException("build url failed.", e);
@@ -310,17 +308,17 @@ public List<ServiceInstance> getInstances(Microservice microservice)
             host = endpointURIBuilder.getHost();
           } else {
             throw new RemoteOperationException(
-                "read response failed. status=" + response.getStatusCode() + ";message=" + response
-                    .getStatusMessage());
+                "read response failed. status:" + response.getStatusCode() + "; message:" + response
+                    .getStatusMessage() + "; content:" + response.getContent());
           }
           instanceList.add(
               new DefaultServiceInstance(instance.getInstanceId(), instance.getServiceId(), host,
                   port, false));
         }
       } else {
         throw new RemoteOperationException(
-            "read response failed. status=" + response.getStatusCode() + ";message=" + response
-                .getStatusMessage());
+            "read response failed. status:" + response.getStatusCode() + "; message:" + response
+                .getStatusMessage() + "; content:" + response.getContent());
       }
     } catch (URISyntaxException e) {
       throw new RemoteOperationException("build url failed.", e);
@@ -344,8 +342,8 @@ public MicroserviceInstanceSingleResponse getInstance(String serviceId, String i
             .readValue(response.getContent(), MicroserviceInstanceSingleResponse.class);
       } else {
         throw new RemoteOperationException(
-            "read response failed. status=" + response.getStatusCode() + ";message=" + response
-                .getStatusMessage());
+            "read response failed. status:" + response.getStatusCode() + "; message:" + response
+                .getStatusMessage() +  "; content:" + response.getContent());
       }
     } catch (URISyntaxException e) {
       throw new RemoteOperationException("build url failed.", e);
@@ -374,8 +372,8 @@ public void heartbeat(HeartbeatRequest heartbeatRequest) throws ServiceCombExcep
         LOGGER.debug("heartbeat success.");
       } else {
         throw new RemoteOperationException(
-            "read response failed. status=" + response.getStatusCode() + ";message=" + response
-                .getStatusMessage());
+            "read response failed. status:" + response.getStatusCode() + "; message:" + response
+                .getStatusMessage()+  "; content:" + response.getContent());
       }
     } catch (URISyntaxException e) {
       throw new RemoteOperationException("build url failed.", e);
@@ -399,9 +397,8 @@ public boolean updateInstanceStatus(String serviceId, String instanceId, String
         return true;
       }
       throw new RemoteOperationException(
-          "update instance status failed. status=" + response.getStatusCode() + ";message="
-              + response
-              .getStatusMessage());
+          "update instance status failed. status:" + response.getStatusCode() + "; message:"
+              + response.getStatusMessage() +  "; content:" + response.getContent());
     } catch (URISyntaxException e) {
       throw new RemoteOperationException("build url failed.", e);
     }
@@ -418,8 +415,8 @@ public MicroserviceResponse getServices() throws ServiceCombException {
         result = JsonUtils.OBJ_MAPPER.readValue(response.getContent(), MicroserviceResponse.class);
       } else {
         throw new RemoteOperationException(
-            "read response failed. status=" + response.getStatusCode() + ";message=" + response
-                .getStatusMessage());
+            "read response failed. status:" + response.getStatusCode() + "; message:" + response
+                .getStatusMessage() +  "; content:" + response.getContent());
       }
     } catch (URISyntaxException e) {
       throw new RemoteOperationException("build url failed.", e);