SteamWar/SpigotCore
Archiviert
13
0

Merge branch 'master' into CommonCoreUpdate
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Dieser Commit ist enthalten in:
yoyosource 2023-12-19 21:11:55 +01:00
Commit d32fd381fb
3 geänderte Dateien mit 25 neuen und 11 gelöschten Zeilen

Datei anzeigen

@ -31,13 +31,17 @@ public class CrashDetector {
private static final long TIMEOUT = 20000; private static final long TIMEOUT = 20000;
private final AtomicLong lastTick = new AtomicLong(Long.MAX_VALUE); private final AtomicLong lastTick = new AtomicLong(Long.MAX_VALUE);
private final AtomicLong lastMessage = new AtomicLong(Long.MAX_VALUE);
private final Thread mainThread = Thread.currentThread(); private final Thread mainThread = Thread.currentThread();
private final Thread watchdog; private final Thread watchdog;
private boolean run = true; private boolean run = true;
public CrashDetector () { public CrashDetector () {
Bukkit.getScheduler().runTaskTimer(Core.getInstance(), () -> lastTick.set(System.currentTimeMillis()), 0, 1); Bukkit.getScheduler().runTaskTimer(Core.getInstance(), () -> {
lastTick.set(System.currentTimeMillis());
lastMessage.set(System.currentTimeMillis());
}, 0, 1);
watchdog = new Thread(this::run, "SteamWar Watchdog"); watchdog = new Thread(this::run, "SteamWar Watchdog");
watchdog.setDaemon(true); watchdog.setDaemon(true);
watchdog.start(); watchdog.start();
@ -56,19 +60,17 @@ public class CrashDetector {
SWException.init(); SWException.init();
while (run) { while (run) {
long curTime = System.currentTimeMillis(); long curTime = System.currentTimeMillis();
if(curTime - TIMEOUT > lastTick.get()) { if(curTime - 4*TIMEOUT >= lastTick.get()) {
SWException.log("Server did not recover in " + (curTime - lastTick.get()) + "ms, unclean server stop", "");
hardStop();
} else if(curTime - TIMEOUT > lastMessage.get()) {
if(mainThread.isAlive()) { if(mainThread.isAlive()) {
SWException.log("Server hung for " + (curTime - lastTick.get()) + "ms", Arrays.stream(mainThread.getStackTrace()).map(StackTraceElement::toString).collect(Collectors.joining("\n"))); SWException.log("Server hung for " + (curTime - lastTick.get()) + "ms", Arrays.stream(mainThread.getStackTrace()).map(StackTraceElement::toString).collect(Collectors.joining("\n")));
} else { } else {
SWException.log("Server thread already dead, unclean server stop", "Core enabled: " + Core.getInstance().isEnabled()); SWException.log("Server thread already dead, unclean server stop", "Core enabled: " + Core.getInstance().isEnabled());
if(Core.getInstance().isEnabled()) { hardStop();
Core.getInstance().onDisable();
}
Statement.closeAll();
//System.exit(0); Does freeze, potential freezing issues: ConsoleRestoreHook, ApplicationShutdownHooks or DeleteOnExitHook
Runtime.getRuntime().halt(0);
} }
lastTick.set(curTime); lastMessage.set(curTime);
} }
try { try {
Thread.sleep(1000); Thread.sleep(1000);
@ -77,4 +79,13 @@ public class CrashDetector {
} }
} }
} }
private void hardStop() {
if(Core.getInstance().isEnabled()) {
Core.getInstance().onDisable();
}
Statement.closeAll();
//System.exit(0); Does freeze, potential freezing issues: ConsoleRestoreHook, ApplicationShutdownHooks or DeleteOnExitHook
Runtime.getRuntime().halt(0);
}
} }

Datei anzeigen

@ -149,6 +149,7 @@ public class ErrorHandler extends Handler {
startsWith.add("Chunk coordinates: "); startsWith.add("Chunk coordinates: ");
startsWith.add("Failed to save history"); startsWith.add("Failed to save history");
startsWith.add("\t... "); startsWith.add("\t... ");
startsWith.add("ERROR IN Protocol");
ignoreStartsWith = Collections.unmodifiableList(startsWith); ignoreStartsWith = Collections.unmodifiableList(startsWith);
List<String> contains = new ArrayList<>(); List<String> contains = new ArrayList<>();

Datei anzeigen

@ -52,12 +52,14 @@ public class SQLWrapperImpl implements SQLWrapper {
String material = config.getString("Schematic.Material", "STONE_BUTTON"); String material = config.getString("Schematic.Material", "STONE_BUTTON");
if(!config.getStringList("CheckQuestions").isEmpty()) { if(!config.getStringList("CheckQuestions").isEmpty()) {
checktype = new SchematicType("C" + type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material); checktype = new SchematicType("C" + type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
tmpTypes.add(checktype); tmpTypes.add(checktype);
tmpFromDB.put(checktype.toDB(), checktype); tmpFromDB.put(checktype.toDB(), checktype);
} }
SchematicType current = new SchematicType(type, shortcut, config.isConfigurationSection("Server") ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material); boolean manualCheck = config.getBoolean("Schematic.ManualCheck", true);
SchematicType current = new SchematicType(type, shortcut, config.isConfigurationSection("Server") ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, manualCheck);
tmpTypes.add(current); tmpTypes.add(current);
tmpFromDB.put(type.toLowerCase(), current); tmpFromDB.put(type.toLowerCase(), current);
} }