From fa76c1fb35069b9f63161dd7137516ab32f069a1 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Fri, 16 Jun 2023 18:35:17 +0300 Subject: [PATCH] fix logging --- .../gatewayapi/config/LoggingInterceptor.java | 32 ++++++++----------- .../config/filters/RequestCachingFilter.java | 4 +-- .../gatewayapi/service/GatewayService.java | 9 ++++-- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java index 9c473f9a6..d89e04bff 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java @@ -10,26 +10,22 @@ import org.springframework.util.StreamUtils; import java.io.IOException; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; public class LoggingInterceptor implements ClientHttpRequestInterceptor { - private final Logger log = LoggerFactory.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); - @Override - public ClientHttpResponse intercept(HttpRequest request, - byte[] body, - ClientHttpRequestExecution execution) throws IOException { - - log.info("Request URI: " + request.getURI()); - log.info("Request method: " + request.getMethod()); - log.info("Request headers: " + request.getHeaders()); - log.info("Request body: " + new String(body, "UTF-8")); - - ClientHttpResponse response = execution.execute(request, body); - - log.info("Response status code: " + response.getStatusCode()); - log.info("Response body: " + StreamUtils.copyToString(response.getBody(), Charset.defaultCharset())); - - return response; - } + @Override + public ClientHttpResponse intercept(HttpRequest request, + byte[] body, + ClientHttpRequestExecution execution) throws IOException { + log.info("Request URI: {}, Request method: {} , Request headers: {}", + request.getURI(), request.getMethod(), request.getHeaders()); + log.info("Request body: " + new String(body, StandardCharsets.UTF_8)); + ClientHttpResponse response = execution.execute(request, body); + log.info("Response status code: " + response.getStatusCode()); + log.info("Response body: " + StreamUtils.copyToString(response.getBody(), Charset.defaultCharset())); + return response; + } } \ No newline at end of file diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/RequestCachingFilter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/RequestCachingFilter.java index 7898f6a13..64ecf59df 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/RequestCachingFilter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/RequestCachingFilter.java @@ -27,8 +27,8 @@ public class RequestCachingFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { CachedHttpServletRequest cachedHttpServletRequest = new CachedHttpServletRequest(request); - log.info("REQUEST QUERY: " + request.getQueryString()); - log.info("REQUEST DATA: " + StreamUtils.copyToString(cachedHttpServletRequest.getInputStream(), StandardCharsets.UTF_8)); + log.debug("Received inbound message by URI: {}", request.getPathInfo()); + log.debug("Request data's inbound message: " + StreamUtils.copyToString(cachedHttpServletRequest.getInputStream(), StandardCharsets.UTF_8)); filterChain.doFilter(cachedHttpServletRequest, response); } } diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java index b84cb4a7c..d431fe1d8 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java @@ -81,7 +81,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean { ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, request, Map.class); Map bodyResponse = response.getBody(); - log.debug("LOCM task complete, response: {}", bodyResponse); + log.debug("LOCM task complete, response from : {}", bodyResponse); } public void requestOnLimit(BaseRequest userRequest) { @@ -144,11 +144,14 @@ public class GatewayService extends QueueConsumer implements InitializingBean { AssetOperationRequest assetOperationRequest = request.getRequestPayload(); Map content = Map.of("direction", "IN", - "amount", assetOperationRequest.getAmount(), - "quantity", assetOperationRequest.getQuantity(), "code", assetOperationRequest.getCode(), "asset", assetOperationRequest.getSecuritySymbol(), "firm_id", assetOperationRequest.getTradingCode()); + if (assetOperationRequest.getAmount() != null) { + content.put("amount", assetOperationRequest.getAmount()); + } else { + content.put("quantity", assetOperationRequest.getQuantity()); + } OutboundRequest outboundRequest = OutboundRequestBuilder.builder() .section(Section.MKR.getKey())