Merge pull request #40 from FusionAuth/degroff/close_socket_on_socket_exception

degroff/close socket on socket exception

Author: robotdan

build.savant

@@ -18,7 +18,7 @@ restifyVersion = "4.2.1"
 slf4jVersion = "2.0.17"
 testngVersion = "7.11.0"
 
-project(group: "io.fusionauth", name: "java-http", version: "1.1.1", licenses: ["ApacheV2_0"]) {
+project(group: "io.fusionauth", name: "java-http", version: "1.1.2", licenses: ["ApacheV2_0"]) {
   workflow {
     fetch {
       // Dependency resolution order:

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.fusionauth</groupId>
   <artifactId>java-http</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <packaging>jar</packaging>
 
   <name>Java HTTP library (client and server)</name>
@@ -200,4 +200,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>

src/main/java/io/fusionauth/http/server/internal/HTTPWorker.java

@@ -256,13 +256,14 @@ public void run() {
       logger.debug("[{}] Closing socket with status [{}]. Bad request, failed to parse request. Reason [{}] Parser state [{}]", Thread.currentThread().threadId(), Status.BadRequest, e.getMessage(), e.getState());
       closeSocketOnError(response, Status.BadRequest);
     } catch (SocketException e) {
-      // This should only happen when the server is shutdown and this thread is waiting to read or write. In that case, this will throw a
-      // SocketException and the thread will be interrupted. Since the server is being shutdown, we should let the client know.
+      // When the HTTPServerThread shuts down, we will interrupt each client thread, so debug log it accordingly.
+      // - This will cause the socket to throw a SocketException, so log it.
       if (Thread.currentThread().isInterrupted()) {
-        // Close socket only. We do not want to potentially delay the shutdown at all.
         logger.debug("[{}] Closing socket. Server is shutting down.", Thread.currentThread().threadId());
-        closeSocketOnly(CloseSocketReason.Expected);
+      } else {
+        logger.debug("[{}] Closing socket. The socket was closed by a client, proxy or otherwise.", Thread.currentThread().threadId());
       }
+      closeSocketOnly(CloseSocketReason.Expected);
     } catch (IOException e) {
       logger.debug(String.format("[%s] Closing socket with status [%d]. An IO exception was thrown during processing. These are pretty common.", Thread.currentThread().threadId(), Status.InternalServerError), e);
       closeSocketOnError(response, Status.InternalServerError);