Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Try to shutdown cleanly when server stops or SIGINT is received

Browse Source
This commit is contained in:
Torsten Grote
2018-08-20 12:46:51 -03:00
parent 5334a8c9ca
commit 31e4045cf7
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.java
View File

@@ -106,4 +106,8 @@ public class BriarService {
return password; return password;
} }
public void stop() {
lifecycleManager.stopServices();
}
} }

6
briar-headless/src/main/java/org/briarproject/briar/headless/Router.java
View File

@@ -14,6 +14,9 @@ import io.javalin.Javalin;
import static io.javalin.ApiBuilder.get; import static io.javalin.ApiBuilder.get;
import static io.javalin.ApiBuilder.path; import static io.javalin.ApiBuilder.path;
import static io.javalin.ApiBuilder.post; import static io.javalin.ApiBuilder.post;
import static io.javalin.event.EventType.SERVER_START_FAILED;
import static io.javalin.event.EventType.SERVER_STOPPED;
import static java.lang.Runtime.getRuntime;
@Immutable @Immutable
@Singleton @Singleton
@@ -35,6 +38,7 @@ public class Router {
public void start() { public void start() {
briarService.start(); briarService.start();
getRuntime().addShutdownHook(new Thread(briarService::stop));
Javalin app = Javalin.create() Javalin app = Javalin.create()
.port(7000) .port(7000)
@@ -42,6 +46,8 @@ public class Router {
.enableStandardRequestLogging() .enableStandardRequestLogging()
.enableRouteOverview("/") .enableRouteOverview("/")
.enableDynamicGzip() .enableDynamicGzip()
.event(SERVER_START_FAILED, event -> briarService.stop())
.event(SERVER_STOPPED, event -> briarService.stop())
.start(); .start();
app.routes(() -> { app.routes(() -> {