From 1dd029559ec0f8ca9d5fb1ad703a83b1b19185d4 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Mon, 3 May 2021 12:10:02 -0400 Subject: [PATCH] Stop Javalin properly on shutdown (#69) --- .../main/kotlin/ir/armor/tachidesk/server/JavalinSetup.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/src/main/kotlin/ir/armor/tachidesk/server/JavalinSetup.kt b/server/src/main/kotlin/ir/armor/tachidesk/server/JavalinSetup.kt index 511801c6..0164cb2a 100644 --- a/server/src/main/kotlin/ir/armor/tachidesk/server/JavalinSetup.kt +++ b/server/src/main/kotlin/ir/armor/tachidesk/server/JavalinSetup.kt @@ -44,6 +44,7 @@ import java.io.IOException import java.text.SimpleDateFormat import java.util.Date import java.util.concurrent.CompletableFuture +import kotlin.concurrent.thread /* * Copyright (C) Contributors to the Suwayomi project @@ -75,6 +76,13 @@ object JavalinSetup { } config.enableCorsForAllOrigins() }.start(serverConfig.ip, serverConfig.port) + + Runtime.getRuntime().addShutdownHook( + thread(start = false) { + app.stop() + } + ) + if (hasWebUiBundled && serverConfig.initialOpenInBrowserEnabled) { openInBrowser() }