Merge pull request #59 from MindustryVN/dev

Dev
MindustryVN · Feb 2, 2025 · 00b6558 · 00b6558
2 parents f2c5f90 + a4a823a
commit 00b6558
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/mindustrytool/servermanager/service/ServerService.java b/src/main/java/mindustrytool/servermanager/service/ServerService.java
@@ -78,14 +78,17 @@ private Mono<Void> handleServerShutdown(ServerInstance server) {
         return shouldShutdownServer(server).flatMap(shouldShutdown -> {
             if (shouldShutdown) {
                 if (server.isKillFlag()) {
+                    log.info("Killing server {} due to no player", server.getId());
                     return shutdown(server.getId());
                 } else {
                     log.info("Server {} has no players, flag to kill.", server.getId());
                     server.setKillFlag(true);
                 }
             } else {
-                log.info("Remove flag from server {}", server.getId());
-                server.setKillFlag(false);
+                if (server.isKillFlag()) {
+                    server.setKillFlag(false);
+                    log.info("Remove flag from server {}", server.getId());
+                }
             }
             return Mono.empty();
         });
@@ -198,7 +201,7 @@ public Mono<ServerDto> initServer(InitServerRequest request) {
             var oldRequest = Utils.readJsonAsClass(container.getLabels().get(Config.serverLabelName), InitServerRequest.class);
 
             if (!oldRequest.equals(request)) {
-                log.info("Found container " + container.getNames()[0] + "with port mismatch, delete container");
+                log.info("Found container " + container.getNames()[0] + "with config mismatch, delete container");
 
                 if (container.getState().equalsIgnoreCase("running")) {
                     dockerClient.stopContainerCmd(containerId).exec();
@@ -220,7 +223,7 @@ public Mono<ServerDto> initServer(InitServerRequest request) {
 
         servers.put(request.getId(), server);
 
-        log.info("Created server: " + request.getName() + " with " + server);
+        log.info("Created server: " + request.getName() + " with " + request);
 
         return gatewayService.of(server.getId())//
                 .getServer()//