X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/1058e33f1208e1ca284d3fd4760380d68093741f..3602ef9be940e287bfe6ed32972ce13fea9deaa4:/src/main/java/org/asamk/signal/http/HttpServerHandler.java diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java index 6cd3b0ef..c9c8fa16 100644 --- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java +++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public class HttpServerHandler implements AutoCloseable { - private final static Logger logger = LoggerFactory.getLogger(HttpServerHandler.class); + private static final Logger logger = LoggerFactory.getLogger(HttpServerHandler.class); private final ObjectMapper objectMapper = Util.createJsonObjectMapper(); @@ -56,7 +56,7 @@ public class HttpServerHandler implements AutoCloseable { if (server != null) { throw new AssertionError("HttpServerHandler already initialized"); } - logger.info("Starting server on " + address.toString()); + logger.debug("Starting HTTP server on {}", address); server = HttpServer.create(address, 0); server.setExecutor(Executors.newCachedThreadPool()); @@ -66,6 +66,21 @@ public class HttpServerHandler implements AutoCloseable { server.createContext("/api/v1/check", this::handleCheckEndpoint); server.start(); + logger.info("Started HTTP server on {}", address); + } + + @Override + public void close() { + if (server != null) { + shutdown.set(true); + synchronized (this) { + this.notifyAll(); + } + // Increase this delay when https://bugs.openjdk.org/browse/JDK-8304065 is fixed + server.stop(2); + server = null; + shutdown.set(false); + } } private void sendResponse(int status, Object response, HttpExchange httpExchange) throws IOException { @@ -221,7 +236,7 @@ public class HttpServerHandler implements AutoCloseable { return List.of(manager); } } - return List.of(); + throw new AssertionError("Unreachable state"); } private List> subscribeReceiveHandlers( @@ -246,20 +261,6 @@ public class HttpServerHandler implements AutoCloseable { m.removeReceiveHandler(handler); } - @Override - public void close() { - if (server != null) { - shutdown.set(true); - synchronized (this) { - this.notifyAll(); - } - // Increase this delay when https://bugs.openjdk.org/browse/JDK-8304065 is fixed - server.stop(2); - server = null; - shutdown.set(false); - } - } - private interface Callable { void call();