Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 07:58:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include HTTP/2 stream idle timeouts in IOExceptionMapper

Browse Source
This commit is contained in:
Chris Eager
2024-03-05 17:51:14 -06:00
committed by Chris Eager
parent 3cc740cda3
commit 9f6a6d7f5b
2 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service/src/main/java/org/whispersystems/textsecuregcm/mappers/IOExceptionMapper.java
View File

@@ -21,8 +21,19 @@ public class IOExceptionMapper implements ExceptionMapper<IOException> {
public Response toResponse(IOException e) {
if (!(e.getCause() instanceof java.util.concurrent.TimeoutException)) {
logger.warn("IOExceptionMapper", e);
} else if (e.getCause().getMessage().startsWith("Idle timeout expired")) {
return Response.status(Response.Status.REQUEST_TIMEOUT).build();
} else {
// Some TimeoutExceptions are because the connection is idle, but are only distinguishable using the exception
// message
final String message = e.getCause().getMessage();
final boolean idleTimeout =
message != null &&
// org.eclipse.jetty.io.IdleTimeout
(message.startsWith("Idle timeout expired")
// org.eclipse.jetty.http2.HTTP2Session
|| (message.startsWith("Idle timeout") && message.endsWith("elapsed")));
if (idleTimeout) {
return Response.status(Response.Status.REQUEST_TIMEOUT).build();
}
}
return Response.status(503).build();