diff --git a/smart-connector-rest-server/pom.xml b/smart-connector-rest-server/pom.xml index 992d02edc..36d943b2a 100644 --- a/smart-connector-rest-server/pom.xml +++ b/smart-connector-rest-server/pom.xml @@ -38,6 +38,11 @@ org.slf4j slf4j-simple + + org.slf4j + jul-to-slf4j + 2.0.20 + org.eclipse.jetty @@ -71,8 +76,8 @@ jersey-container-servlet - org.glassfish.jersey.ext - jersey-bean-validation + org.glassfish.jersey.ext + jersey-bean-validation diff --git a/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/EofExceptionInterceptor.java b/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/EofExceptionInterceptor.java new file mode 100644 index 000000000..9916886cc --- /dev/null +++ b/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/EofExceptionInterceptor.java @@ -0,0 +1,60 @@ +package eu.knowledge.engine.rest.api; + +import java.io.IOException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.ext.WriterInterceptorContext; + +@Provider +public class EofExceptionInterceptor implements WriterInterceptor { + + private static final Logger LOG = LoggerFactory.getLogger(EofExceptionInterceptor.class); + + @Override + public void aroundWriteTo(WriterInterceptorContext context) throws IOException { + + try { + context.proceed(); + } catch (Exception e) { + if (isClientDisconnect(e)) { + LOG.warn("Client disconnected while writing response: {}", findMessage(e)); + LOG.trace("The following exception occurred.", e); + return; + } + + throw e; + } + } + + private static String findMessage(Throwable t) { + while (t != null) { + if (t.getMessage() != null && !t.getMessage().isBlank()) { + return t.getMessage(); + } + t = t.getCause(); + } + return ""; + } + + private static boolean isClientDisconnect(Throwable t) { + while (t != null) { + if (t instanceof IOException) { + String msg = t.getMessage(); + if (msg != null) { + msg = msg.toLowerCase(); + + if (msg.contains("broken pipe") || msg.contains("connection reset by peer")) { + return true; + } + } + } + + t = t.getCause(); + } + return false; + } +} \ No newline at end of file diff --git a/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/RestServer.java b/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/RestServer.java index 209ca73ea..d081d95a2 100644 --- a/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/RestServer.java +++ b/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/RestServer.java @@ -1,6 +1,7 @@ package eu.knowledge.engine.rest.api; import org.eclipse.jetty.server.Server; +import org.slf4j.bridge.SLF4JBridgeHandler; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.glassfish.jersey.server.ResourceConfig; @@ -45,6 +46,9 @@ public static void main(String[] args) { ctx.addServlet(jerseyServlet, "/rest/*"); + SLF4JBridgeHandler.removeHandlersForRootLogger(); + SLF4JBridgeHandler.install(); + try { server.start(); server.join(); diff --git a/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/impl/ProactiveApiServiceImpl.java b/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/impl/ProactiveApiServiceImpl.java index 44c1404bc..13d7374f1 100644 --- a/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/impl/ProactiveApiServiceImpl.java +++ b/smart-connector-rest-server/src/main/java/eu/knowledge/engine/rest/api/impl/ProactiveApiServiceImpl.java @@ -9,7 +9,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; -import java.util.stream.Collectors; import org.apache.jena.sparql.graph.PrefixMappingZero; import org.apache.jena.sparql.util.FmtUtils;