R3944Realms/ModernFix-fix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix thread leak and graceful shutdown issue in NightConfigWatchThrottler

Browse Source 
Fix thread leak and graceful shutdown issue in NightConfigWatchThrottler
This commit is contained in:
thirtyninerealms-cloud 2026-06-14 17:30:06 +08:00 committed by GitHub
commit 667ac6c6ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/embeddedt/modernfix/forge/config/NightConfigWatchThrottler.java
View File

@ -18,9 +18,18 @@ import java.util.concurrent.locks.LockSupport;
*/ */
public class NightConfigWatchThrottler { public class NightConfigWatchThrottler {
private static final long DELAY = TimeUnit.MILLISECONDS.toNanos(1000); private static final long DELAY = TimeUnit.MILLISECONDS.toNanos(1000);
// FIXED: Add shutdown hook to clean up watcher threads
private static void addShutdownHook() {
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
isShuttingDown.set(true);
}, "ModernFix-ShutdownHook"));
}
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public static void throttle() { public static void throttle() {
// FIXED: Register shutdown hook for clean cleanup
addShutdownHook();
Map watchedDirs = ObfuscationReflectionHelper.getPrivateValue(FileWatcher.class, FileWatcher.defaultInstance(), "watchedDirs"); Map watchedDirs = ObfuscationReflectionHelper.getPrivateValue(FileWatcher.class, FileWatcher.defaultInstance(), "watchedDirs");
Thread launchThread = Thread.currentThread(); Thread launchThread = Thread.currentThread();
Map watchedDirsWrapper = new ForwardingMap() { Map watchedDirsWrapper = new ForwardingMap() {
@ -46,7 +55,15 @@ public class NightConfigWatchThrottler {
// iterator() is called at the beginning of each iteration of the watch loop, // iterator() is called at the beginning of each iteration of the watch loop,
// so it is a good spot to inject the delay. // so it is a good spot to inject the delay.
if (Thread.currentThread() != launchThread) { if (Thread.currentThread() != launchThread) {
// FIXED: Check for shutdown state to prevent new watches from being created
if (isShuttingDown.get()) {
return java.util.Collections.emptyIterator();
}
LockSupport.parkNanos(DELAY); LockSupport.parkNanos(DELAY);
// FIXED: Properly handle thread interruption to allow graceful container shutdown
if (Thread.currentThread().isInterrupted()) {
return java.util.Collections.emptyIterator();
}
} }
return super.iterator(); return super.iterator();
} }