root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

WebAsyncManager handles disconnected client errors 

See gh-32042
This commit is contained in:
rstoyanchev 2024-01-22 17:17:18 +00:00
parent 7e53a1f048
commit 9230a7db16
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -33,6 +33,7 @@ import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.async.DeferredResult.DeferredResultHandler; import org.springframework.web.context.request.async.DeferredResult.DeferredResultHandler;
import org.springframework.web.util.DisconnectedClientHelper;
/** /**
* The central class for managing asynchronous request processing, mainly intended * The central class for managing asynchronous request processing, mainly intended
@ -66,6 +67,16 @@ public final class WebAsyncManager {
private static final Log logger = LogFactory.getLog(WebAsyncManager.class); private static final Log logger = LogFactory.getLog(WebAsyncManager.class);
/**
* Log category to use for network failure after a client has gone away.
* @see DisconnectedClientHelper
*/
private static final String DISCONNECTED_CLIENT_LOG_CATEGORY =
"org.springframework.web.server.DisconnectedClient";
private static final DisconnectedClientHelper disconnectedClientHelper =
new DisconnectedClientHelper(DISCONNECTED_CLIENT_LOG_CATEGORY);
private static final CallableProcessingInterceptor timeoutCallableInterceptor = private static final CallableProcessingInterceptor timeoutCallableInterceptor =
new TimeoutCallableProcessingInterceptor(); new TimeoutCallableProcessingInterceptor();
@ -370,9 +381,13 @@ public final class WebAsyncManager {
return; return;
} }
if (result instanceof Exception ex && disconnectedClientHelper.checkAndLogClientDisconnectedException(ex)) {
return;
}
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
boolean isError = result instanceof Throwable; logger.debug("Async " + (this.errorHandlingInProgress ? "error" : "result set") +
logger.debug("Async " + (isError ? "error" : "result set") + ", dispatch to " + formatRequestUri()); ", dispatch to " + formatRequestUri());
} }
this.asyncWebRequest.dispatch(); this.asyncWebRequest.dispatch();
} }