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

Add logging in GraphQL handlers

Browse Source
This commit is contained in:
Rossen Stoyanchev
2020-11-29 20:14:03 +00:00
parent b10d5f7df7
commit fd9151adec
3 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-graphql-web/src/main/java/org/springframework/graphql/WebFluxGraphQLHandler.java
View File

@@ -21,6 +21,8 @@ import java.util.Map;
import graphql.ExecutionResult;
import graphql.GraphQL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Mono;
@@ -44,6 +46,9 @@ import org.springframework.web.reactive.socket.WebSocketSession;
*/
public class WebFluxGraphQLHandler {
private static Log logger = LogFactory.getLog(WebFluxGraphQLHandler.class);
private final WebInterceptorExecutionChain executionChain;
private final Decoder<?> jsonDecoder;
@@ -76,14 +81,21 @@ public class WebFluxGraphQLHandler {
return request.bodyToMono(WebInput.MAP_PARAMETERIZED_TYPE_REF)
.flatMap(body -> {
WebInput webInput = new WebInput(request.uri(), request.headers().asHttpHeaders(), body);
if (logger.isDebugEnabled()) {
logger.debug("Executing: " + webInput);
}
return this.executionChain.execute(webInput);
})
.flatMap(output -> {
Map<String, Object> spec = output.toSpecification();
if (logger.isDebugEnabled()) {
logger.debug("Execution complete");
}
ServerResponse.BodyBuilder builder = ServerResponse.ok();
if (output.getHeaders() != null) {
builder.headers(headers -> headers.putAll(output.getHeaders()));
}
return builder.bodyValue(output.toSpecification());
return builder.bodyValue(spec);
});
}
@@ -108,6 +120,9 @@ public class WebFluxGraphQLHandler {
Map<String, Object> map = decode(message);
HandshakeInfo handshakeInfo = session.getHandshakeInfo();
WebInput webInput = new WebInput(handshakeInfo.getUri(), handshakeInfo.getHeaders(), map);
if (logger.isDebugEnabled()) {
logger.debug("Executing: " + webInput);
}
return executionChain.execute(webInput);
})
.concatMap(output -> {
@@ -119,9 +134,15 @@ public class WebFluxGraphQLHandler {
throw new IllegalStateException(
"Expected Publisher<ExecutionResult>: " + output.toSpecification());
}
if (logger.isDebugEnabled()) {
logger.debug("Execution complete, subscribing for events.");
}
return (Publisher<ExecutionResult>) output.getData();
})
.map(result -> encode(session, result.getData()))
.map(result -> {
Object data = result.getData();
return encode(session, data);
})
);
}

7
spring-graphql-web/src/main/java/org/springframework/graphql/WebInput.java
View File

@@ -129,9 +129,8 @@ public class WebInput {
@Override
public String toString() {
return "WebInput [" + uri() + " " + headers() + ", query='" + query() + "'" +
(operationName() != null ? ", operationName='" + operationName() + "'" : "") +
(!CollectionUtils.isEmpty(variables()) ? ", variables=" + variables() : "") +
"]";
return "Query='" + query() + "'" +
(operationName() != null ? ", Operation='" + operationName() + "'" : "") +
(!CollectionUtils.isEmpty(variables()) ? ", Variables=" + variables() : "");
}
}

11
spring-graphql-web/src/main/java/org/springframework/graphql/WebMvcGraphQLHandler.java
View File

@@ -22,6 +22,8 @@ import java.util.Map;
import javax.servlet.ServletException;
import graphql.GraphQL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import reactor.core.publisher.Mono;
import org.springframework.web.HttpMediaTypeNotSupportedException;
@@ -36,6 +38,9 @@ import org.springframework.web.servlet.function.ServerResponse;
*/
public class WebMvcGraphQLHandler implements HandlerFunction<ServerResponse> {
private static Log logger = LogFactory.getLog(WebMvcGraphQLHandler.class);
private final WebInterceptorExecutionChain executionChain;
@@ -59,8 +64,14 @@ public class WebMvcGraphQLHandler implements HandlerFunction<ServerResponse> {
*/
public ServerResponse handle(ServerRequest request) throws ServletException {
WebInput webInput = new WebInput(request.uri(), request.headers().asHttpHeaders(), readBody(request));
if (logger.isDebugEnabled()) {
logger.debug("Executing: " + webInput);
}
Mono<ServerResponse> responseMono = this.executionChain.execute(webInput)
.map(output -> {
if (logger.isDebugEnabled()) {
logger.debug("Execution complete");
}
ServerResponse.BodyBuilder builder = ServerResponse.ok();
if (output.getHeaders() != null) {
builder.headers(headers -> headers.putAll(output.getHeaders()));