From cab46763df87b1aacf51a9c064a3f5fc49642df9 Mon Sep 17 00:00:00 2001
From: Niki Roo <niki@nikiroo.be>
Date: Thu, 14 May 2020 17:32:54 +0200
Subject: [PATCH] fix STOP server

---
 .../fanfix/library/WebLibraryServer.java      | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/be/nikiroo/fanfix/library/WebLibraryServer.java b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
index 50dc3d9..22f36e9 100644
--- a/src/be/nikiroo/fanfix/library/WebLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
@@ -110,7 +110,7 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 			return NanoHTTPD.newFixedLengthResponse(Status.SERVICE_UNAVAILABLE,
 					NanoHTTPD.MIME_PLAINTEXT, "Server is already exiting...");
 		}
-		
+
 		exiting = true;
 		Instance.getInstance().getTraceHandler().trace("Exiting");
 
@@ -131,6 +131,20 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 
 		doStop();
 
+		new Thread(new Runnable() {
+			@Override
+			public void run() {
+				try {
+					Thread.sleep(1500);
+				} catch (InterruptedException e) {
+				}
+
+				Instance.getInstance().getTraceHandler()
+						.trace("Exit timeout: force-quit");
+				System.exit(0);
+			}
+		}, "Exit program after timeout of 1500 ms").start();
+
 		return NanoHTTPD.newFixedLengthResponse(Status.OK,
 				NanoHTTPD.MIME_PLAINTEXT, "Exited");
 	}
@@ -341,7 +355,7 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 			return NanoHTTPD.newFixedLengthResponse(Status.FORBIDDEN,
 					NanoHTTPD.MIME_PLAINTEXT, "SET story part not allowed");
 		}
-		
+
 		if (exiting) {
 			return NanoHTTPD.newFixedLengthResponse(Status.SERVICE_UNAVAILABLE,
 					NanoHTTPD.MIME_PLAINTEXT, "Server is exiting...");
@@ -426,7 +440,7 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 			return NanoHTTPD.newFixedLengthResponse(Status.FORBIDDEN,
 					NanoHTTPD.MIME_PLAINTEXT, "Cover request not allowed");
 		}
-		
+
 		if (exiting) {
 			return NanoHTTPD.newFixedLengthResponse(Status.SERVICE_UNAVAILABLE,
 					NanoHTTPD.MIME_PLAINTEXT, "Server is exiting...");
@@ -457,7 +471,7 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 			return NanoHTTPD.newFixedLengthResponse(Status.FORBIDDEN,
 					NanoHTTPD.MIME_PLAINTEXT, "Import not allowed");
 		}
-		
+
 		if (exiting) {
 			return NanoHTTPD.newFixedLengthResponse(Status.SERVICE_UNAVAILABLE,
 					NanoHTTPD.MIME_PLAINTEXT, "Server is exiting...");
@@ -529,7 +543,7 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 			return NanoHTTPD.newFixedLengthResponse(Status.FORBIDDEN,
 					NanoHTTPD.MIME_PLAINTEXT, "Delete not allowed");
 		}
-		
+
 		if (exiting) {
 			return NanoHTTPD.newFixedLengthResponse(Status.SERVICE_UNAVAILABLE,
 					NanoHTTPD.MIME_PLAINTEXT, "Server is exiting...");
-- 
2.27.0