Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add LogFormatUtils

Browse Source 
1. Helper method to eliminate duplication in formatting (de-)serialized
   values for logging introduced with prior commit #e62298.

2. Helper method for TRACE vs DEBUG logging with different details.

Issue: SPR-17254
This commit is contained in:
Rossen Stoyanchev
2018-09-14 14:38:11 -04:00
parent 41d4cb5cbf
commit db8e9eafb2
24 changed files with 212 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java
View File

@@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import reactor.core.publisher.Mono;
import org.springframework.core.log.LogFormatUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -109,29 +110,19 @@ public abstract class ExchangeFunctions {
}
private void logRequest(ClientRequest request) {
if (logger.isDebugEnabled()) {
String message = request.logPrefix() + "HTTP " + request.method() + " " + request.url();
if (logger.isTraceEnabled()) {
logger.trace(message + ", headers=" + formatHeaders(request.headers()));
}
else {
logger.debug(message);
}
}
LogFormatUtils.traceDebug(logger, traceOn ->
request.logPrefix() + "HTTP " + request.method() + " " + request.url() +
(traceOn ? ", headers=" + formatHeaders(request.headers()) : "")
);
}
private void logResponse(ClientHttpResponse response, String logPrefix) {
if (logger.isDebugEnabled()) {
LogFormatUtils.traceDebug(logger, traceOn -> {
int code = response.getRawStatusCode();
HttpStatus status = HttpStatus.resolve(code);
String message = logPrefix + "Response " + (status != null ? status : code);
if (logger.isTraceEnabled()) {
logger.trace(message + ", headers=" + formatHeaders(response.getHeaders()));
}
else {
logger.debug(message);
}
}
return logPrefix + "Response " + (status != null ? status : code) +
(traceOn ? ", headers=" + formatHeaders(response.getHeaders()) : "");
});
}
private String formatHeaders(HttpHeaders headers) {