treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix logging

Browse source
This commit is contained in:
etreschenkov 2023-06-16 18:35:17 +03:00
parent 3f8b24319c
commit fa76c1fb35
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java
View file

@ -10,26 +10,22 @@ import org.springframework.util.StreamUtils;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
public class LoggingInterceptor implements ClientHttpRequestInterceptor { public class LoggingInterceptor implements ClientHttpRequestInterceptor {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@Override @Override
public ClientHttpResponse intercept(HttpRequest request, public ClientHttpResponse intercept(HttpRequest request,
byte[] body, byte[] body,
ClientHttpRequestExecution execution) throws IOException { ClientHttpRequestExecution execution) throws IOException {
log.info("Request URI: {}, Request method: {} , Request headers: {}",
log.info("Request URI: " + request.getURI()); request.getURI(), request.getMethod(), request.getHeaders());
log.info("Request method: " + request.getMethod()); log.info("Request body: " + new String(body, StandardCharsets.UTF_8));
log.info("Request headers: " + request.getHeaders()); ClientHttpResponse response = execution.execute(request, body);
log.info("Request body: " + new String(body, "UTF-8")); log.info("Response status code: " + response.getStatusCode());
log.info("Response body: " + StreamUtils.copyToString(response.getBody(), Charset.defaultCharset()));
ClientHttpResponse response = execution.execute(request, body); return response;
}
log.info("Response status code: " + response.getStatusCode());
log.info("Response body: " + StreamUtils.copyToString(response.getBody(), Charset.defaultCharset()));
return response;
}
} }

4
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/RequestCachingFilter.java
View file

@ -27,8 +27,8 @@ public class RequestCachingFilter extends OncePerRequestFilter {
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
FilterChain filterChain) throws ServletException, IOException { FilterChain filterChain) throws ServletException, IOException {
CachedHttpServletRequest cachedHttpServletRequest = new CachedHttpServletRequest(request); CachedHttpServletRequest cachedHttpServletRequest = new CachedHttpServletRequest(request);
log.info("REQUEST QUERY: " + request.getQueryString()); log.debug("Received inbound message by URI: {}", request.getPathInfo());
log.info("REQUEST DATA: " + StreamUtils.copyToString(cachedHttpServletRequest.getInputStream(), StandardCharsets.UTF_8)); log.debug("Request data's inbound message: " + StreamUtils.copyToString(cachedHttpServletRequest.getInputStream(), StandardCharsets.UTF_8));
filterChain.doFilter(cachedHttpServletRequest, response); filterChain.doFilter(cachedHttpServletRequest, response);
} }
} }

9
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
View file

@ -81,7 +81,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
ResponseEntity<Map> response = restTemplate.exchange(url, HttpMethod.POST, request, Map.class); ResponseEntity<Map> response = restTemplate.exchange(url, HttpMethod.POST, request, Map.class);
Map bodyResponse = response.getBody(); Map bodyResponse = response.getBody();
log.debug("LOCM task complete, response: {}", bodyResponse); log.debug("LOCM task complete, response from : {}", bodyResponse);
} }
public void requestOnLimit(BaseRequest<LimExportedRequest> userRequest) { public void requestOnLimit(BaseRequest<LimExportedRequest> userRequest) {
@ -144,11 +144,14 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
AssetOperationRequest assetOperationRequest = request.getRequestPayload(); AssetOperationRequest assetOperationRequest = request.getRequestPayload();
Map<String, Object> content = Map.of("direction", "IN", Map<String, Object> content = Map.of("direction", "IN",
"amount", assetOperationRequest.getAmount(),
"quantity", assetOperationRequest.getQuantity(),
"code", assetOperationRequest.getCode(), "code", assetOperationRequest.getCode(),
"asset", assetOperationRequest.getSecuritySymbol(), "asset", assetOperationRequest.getSecuritySymbol(),
"firm_id", assetOperationRequest.getTradingCode()); "firm_id", assetOperationRequest.getTradingCode());
if (assetOperationRequest.getAmount() != null) {
content.put("amount", assetOperationRequest.getAmount());
} else {
content.put("quantity", assetOperationRequest.getQuantity());
}
OutboundRequest outboundRequest = OutboundRequestBuilder.builder() OutboundRequest outboundRequest = OutboundRequestBuilder.builder()
.section(Section.MKR.getKey()) .section(Section.MKR.getKey())