diff --git a/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java b/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java index 2eb07b9..2952497 100644 --- a/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java +++ b/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java @@ -8,6 +8,7 @@ import org.apache.logging.log4j.LogManager; import java.net.URI; import java.net.http.HttpClient; import java.net.http.WebSocket; +import java.nio.ByteBuffer; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.CountDownLatch; diff --git a/SymphonyDiscovery/pom.xml b/SymphonyDiscovery/pom.xml index c6d7b4b..331d17b 100644 --- a/SymphonyDiscovery/pom.xml +++ b/SymphonyDiscovery/pom.xml @@ -38,6 +38,17 @@ slf4j-simple 2.0.16 + + ch.qos.logback + logback-classic + 1.4.12 + + + + ch.qos.logback + logback-core + 1.4.14 + diff --git a/SymphonyDiscovery/src/main/java/io/github/lumijiez/JavalinConfig.java b/SymphonyDiscovery/src/main/java/io/github/lumijiez/JavalinConfig.java index a3a33b2..a4bb1a8 100644 --- a/SymphonyDiscovery/src/main/java/io/github/lumijiez/JavalinConfig.java +++ b/SymphonyDiscovery/src/main/java/io/github/lumijiez/JavalinConfig.java @@ -3,16 +3,17 @@ package io.github.lumijiez; import io.javalin.Javalin; import io.javalin.websocket.WsContext; +import java.nio.ByteBuffer; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; public class JavalinConfig { private static final Map users = new ConcurrentHashMap<>(); + private static final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(); - public static void setup(Javalin app) { - app.get("/check", ctx -> ctx.result("OK")); - - app.ws("/discovery", ws -> { + public static void setup(Javalin app) { app.ws("/discovery", ws -> { ws.onConnect(ctx -> { String id = ctx.sessionId(); users.put(id, ctx); diff --git a/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java b/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java index 0409c29..4842411 100644 --- a/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java +++ b/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java @@ -3,9 +3,16 @@ package io.github.lumijiez; import io.javalin.Javalin; import io.javalin.json.JavalinGson; +import java.time.Duration; + public class Main { public static void main(String[] args) { - Javalin app = Javalin.create(config -> config.jsonMapper(new JavalinGson())).start(8083); + Javalin app = Javalin.create(config -> { + config.jsonMapper(new JavalinGson()); + config.jetty.modifyWebSocketServletFactory(wsFactoryConfig -> { + wsFactoryConfig.setIdleTimeout(Duration.ZERO); + }); + }).start(8083); JavalinConfig.setup(app); diff --git a/docker-compose.yml b/docker-compose.yml index cdf0e73..245b92b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -107,7 +107,6 @@ services: - POSTGRES_USER=symphony - POSTGRES_PASSWORD=symphony - POSTGRES_DB=symphony - - POSTGRES_INITDB_ARGS="--log-min-messages=error" volumes: - ./config/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql ports: