Remove Servertype enum, fix starting multiple servers at once,

This commit is contained in:
Lixfel
2024-12-03 15:42:57 +01:00
parent 57d4727f35
commit d2650ad97f
22 changed files with 130 additions and 176 deletions
@@ -29,7 +29,7 @@ public class Arenaserver extends Subserver {
private final boolean allowMerge;
public Arenaserver(String serverName, String mode, String map, boolean allowMerge, int port, ProcessBuilder processBuilder, Runnable shutdownCallback) {
super(Servertype.ARENA, serverName, port, processBuilder, shutdownCallback, null);
super(serverName, port, processBuilder, shutdownCallback, null);
this.mode = mode;
this.map = map;
this.allowMerge = allowMerge;
@@ -42,7 +42,7 @@ public class Bauserver extends Subserver {
}
public Bauserver(String serverName, UUID owner, int port, ProcessBuilder processBuilder, Runnable shutdownCallback, Consumer<Exception> failureCallback){
super(Servertype.BAUSERVER, serverName, port, processBuilder, shutdownCallback, failureCallback);
super(serverName, port, processBuilder, shutdownCallback, failureCallback);
this.owner = owner;
synchronized (servers) {
@@ -41,7 +41,7 @@ public class Builderserver extends Subserver {
}
public Builderserver(String serverName, String map, int port, ProcessBuilder processBuilder, Runnable shutdownCallback, Consumer<Exception> failureCallback){
super(Servertype.BUILDER, serverName, port, processBuilder, shutdownCallback, failureCallback);
super(serverName, port, processBuilder, shutdownCallback, failureCallback);
this.map = map;
synchronized (servers) {
@@ -1,26 +0,0 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2024 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.persistent;
public enum Servertype {
BAUSERVER,
ARENA,
BUILDER
}
@@ -38,9 +38,20 @@ import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.logging.Logger;
@SuppressWarnings("unused")
public class Subserver {
public static boolean isArena(Subserver subserver) {
return subserver instanceof Arenaserver;
}
public static boolean isBuild(Subserver subserver) {
return subserver instanceof Bauserver;
}
public static boolean isBuilder(Subserver subserver) {
return subserver instanceof Builderserver;
}
private static final Component PREFIX = Component
.text("Steam").color(NamedTextColor.YELLOW)
.append(Component.text("War» ").color(NamedTextColor.DARK_GRAY));
@@ -84,8 +95,6 @@ public class Subserver {
private final ServerInfo server;
@Getter
private RegisteredServer registeredServer;
@Getter
private final Servertype type;
private final Thread thread;
@Getter
private boolean started;
@@ -94,10 +103,9 @@ public class Subserver {
@Getter
private final Map<Player, String> tablistNames = new HashMap<>();
protected Subserver(Servertype type, String serverName, int port, ProcessBuilder processBuilder, Runnable shutdownCallback, Consumer<Exception> failureCallback) {
protected Subserver(String serverName, int port, ProcessBuilder processBuilder, Runnable shutdownCallback, Consumer<Exception> failureCallback) {
this.started = false;
this.serverName = serverName;
this.type = type;
this.shutdownCallback = shutdownCallback;
this.failureCallback = failureCallback == null ? this::fatalError : failureCallback;
this.checkpoint = processBuilder.command().contains("criu");
@@ -112,6 +120,8 @@ public class Subserver {
this.server = new ServerInfo(serverName, address);
this.writer = new PrintWriter(process.getOutputStream(), true);
register();
this.thread = new Thread(this::run, "Subserver " + serverName);
this.thread.start();
}
@@ -146,7 +156,8 @@ public class Subserver {
process.destroyForcibly();
}
thread.join();
if(thread.isAlive())
thread.join();
} catch (InterruptedException e) {
logger.log(Level.SEVERE, "Subserver stop interrupted!", e);
Thread.currentThread().interrupt();
@@ -205,8 +216,6 @@ public class Subserver {
}
private void run() {
register();
Exception ex = null;
try {
if (checkpoint) {