From 16dccada9dc69bfd077f02b7c523df29fe98b5c7 Mon Sep 17 00:00:00 2001 From: Sascha Lisson Date: Fri, 20 Dec 2024 17:21:07 +0100 Subject: [PATCH 1/2] fix: NPE during closing of websocket connections --- .../instancesmanager/ProxyServletWithWebsocketSupport.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instances-manager/src/main/kotlin/org/modelix/instancesmanager/ProxyServletWithWebsocketSupport.kt b/instances-manager/src/main/kotlin/org/modelix/instancesmanager/ProxyServletWithWebsocketSupport.kt index 98bb600..14f15de 100644 --- a/instances-manager/src/main/kotlin/org/modelix/instancesmanager/ProxyServletWithWebsocketSupport.kt +++ b/instances-manager/src/main/kotlin/org/modelix/instancesmanager/ProxyServletWithWebsocketSupport.kt @@ -160,7 +160,7 @@ abstract class ProxyServletWithWebsocketSupport : ProxyServlet() { } } - override fun onWebSocketClose(statusCode: Int, reason: String) { + override fun onWebSocketClose(statusCode: Int, reason: String?) { sessionA?.close(statusCode, reason) } From ea1741a74094ca1d54c957a55e94b9766554007d Mon Sep 17 00:00:00 2001 From: Sascha Lisson Date: Fri, 20 Dec 2024 17:21:30 +0100 Subject: [PATCH 2/2] fix: debug port on instances-manager wasn't open --- instances-manager/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instances-manager/Dockerfile b/instances-manager/Dockerfile index 054b05e..e887ae2 100644 --- a/instances-manager/Dockerfile +++ b/instances-manager/Dockerfile @@ -4,5 +4,5 @@ WORKDIR /instances-manager/ EXPOSE 33332 COPY build/install/instances-manager/ /instances-manager/ -ENV instances_MANAGER_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -XX:MaxRAMPercentage=85" +ENV INSTANCES_MANAGER_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -XX:MaxRAMPercentage=85" CMD ["/instances-manager/bin/instances-manager"] \ No newline at end of file