From cf360b80cf4611ff2a4cd6f979455a23d5cec5be Mon Sep 17 00:00:00 2001 From: GuoYL Date: Wed, 26 Feb 2020 15:26:15 +0800 Subject: [PATCH] [issue #142] log optimization/ fix typo --- .../client/ServiceCombConfigClient.java | 8 ++-- ...yBoostrap.java => DiscoveryBootstrap.java} | 2 +- .../discovery/client/ServiceCombClient.java | 47 +++++++++---------- 3 files changed, 27 insertions(+), 30 deletions(-) rename spring-cloud-huawei-sample/discovery-demo/war-deployment-demo/src/main/java/com/huaweicloud/sample/{DiscoveryBoostrap.java => DiscoveryBootstrap.java} (93%) diff --git a/spring-cloud-huawei-config/src/main/java/com/huaweicloud/config/client/ServiceCombConfigClient.java b/spring-cloud-huawei-config/src/main/java/com/huaweicloud/config/client/ServiceCombConfigClient.java index a93b83f50..86829cf07 100644 --- a/spring-cloud-huawei-config/src/main/java/com/huaweicloud/config/client/ServiceCombConfigClient.java +++ b/spring-cloud-huawei-config/src/main/java/com/huaweicloud/config/client/ServiceCombConfigClient.java @@ -131,8 +131,8 @@ public Map 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 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(); diff --git a/spring-cloud-huawei-sample/discovery-demo/war-deployment-demo/src/main/java/com/huaweicloud/sample/DiscoveryBoostrap.java b/spring-cloud-huawei-sample/discovery-demo/war-deployment-demo/src/main/java/com/huaweicloud/sample/DiscoveryBootstrap.java similarity index 93% rename from spring-cloud-huawei-sample/discovery-demo/war-deployment-demo/src/main/java/com/huaweicloud/sample/DiscoveryBoostrap.java rename to spring-cloud-huawei-sample/discovery-demo/war-deployment-demo/src/main/java/com/huaweicloud/sample/DiscoveryBootstrap.java index 4f474f3b9..b7829aa0e 100644 --- a/spring-cloud-huawei-sample/discovery-demo/war-deployment-demo/src/main/java/com/huaweicloud/sample/DiscoveryBoostrap.java +++ b/spring-cloud-huawei-sample/discovery-demo/war-deployment-demo/src/main/java/com/huaweicloud/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/spring-cloud-huawei-servicecomb-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/client/ServiceCombClient.java b/spring-cloud-huawei-servicecomb-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/client/ServiceCombClient.java index c77b12b96..823310702 100644 --- a/spring-cloud-huawei-servicecomb-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/client/ServiceCombClient.java +++ b/spring-cloud-huawei-servicecomb-discovery/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); @@ -127,9 +127,7 @@ public MicroserviceInstancesResponse getServiceCenterInstances() .getStatusMessage()); } 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); @@ -231,8 +229,8 @@ public String registerInstance(MicroserviceInstance microserviceInstance) } else { throw new RemoteOperationException( "read response failed. url=" + formatUrl + "status=" + response.getStatusCode() - + ";message=" + response - .getStatusMessage()); + + "; message=" + response.getStatusMessage() + "; content:" + response + .getContent()); } } catch (URISyntaxException e) { throw new RemoteOperationException("build url failed.", e); @@ -263,8 +261,8 @@ public boolean deRegisterInstance(String serviceId, String instanceId) } else { throw new RemoteOperationException( "deRegister failed. url=" + formatUrl + "status=" + response.getStatusCode() - + ";message=" + response - .getStatusMessage()); + + "; message=" + response.getStatusMessage() + "; content:" + response + .getContent()); } } catch (URISyntaxException e) { throw new RemoteOperationException("build url failed.", e); @@ -310,8 +308,8 @@ public List 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, @@ -319,8 +317,8 @@ public List getInstances(Microservice microservice) } } 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);