refactor: indicate client/server instance should be closed

Zmax0 · Jun 25, 2024 · 5fe4956 · 5fe4956
1 parent 702b0af
commit 5fe4956
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/urban-spork-client/src/com/urbanspork/client/Client.java b/urban-spork-client/src/com/urbanspork/client/Client.java
@@ -25,6 +25,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Closeable;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.concurrent.CompletableFuture;
@@ -101,7 +102,8 @@ protected void initChannel(Channel ch) {
             .bind(InetAddress.getLoopbackAddress(), config.getPort()).sync().channel();
     }
 
-    public record Instance(ServerSocketChannel tcp, DatagramChannel udp, TrafficCounter traffic) {
+    public record Instance(ServerSocketChannel tcp, DatagramChannel udp, TrafficCounter traffic) implements Closeable {
+        @Override
         public void close() {
             traffic.stop();
             tcp.close().awaitUninterruptibly();

diff --git a/urban-spork-common/src/com/urbanspork/common/channel/ExceptionHandler.java b/urban-spork-common/src/com/urbanspork/common/channel/ExceptionHandler.java
@@ -30,8 +30,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
         if (cause.getCause() instanceof InvalidCipherTextException) {
             logger.error("[{}][{}][{}] Invalid cipher text", transport, protocol, transLog);
         } else {
-            String msg = String.format("[%s][%s][%s] Caught exception", transport, protocol, transLog);
-            logger.error(msg, cause);
+            logger.error("[{}][{}][{}] Caught exception", transport, protocol, transLog, cause);
         }
         ctx.close();
     }

diff --git a/urban-spork-server/src/com/urbanspork/server/Server.java b/urban-spork-server/src/com/urbanspork/server/Server.java
@@ -24,6 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -127,7 +128,8 @@ protected void initChannel(Channel ch) {
         }
     }
 
-    public record Instance(ServerSocketChannel tcp, Optional<DatagramChannel> udp) {
+    public record Instance(ServerSocketChannel tcp, Optional<DatagramChannel> udp) implements Closeable {
+        @Override
         public void close() {
             tcp.close().awaitUninterruptibly();
             udp.ifPresent(c -> c.close().awaitUninterruptibly());