zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Use isAlive for monitoring consumer thread

Browse source
This commit is contained in:
Intelli 2021-10-04 15:55:54 -06:00
parent bc39bc03d6
commit 554e17df02
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/net/coreprotect/consumer/Consumer.java
View file

@ -17,12 +17,12 @@ import net.coreprotect.consumer.process.Process;
public class Consumer extends Process implements Runnable, Thread.UncaughtExceptionHandler { public class Consumer extends Process implements Runnable, Thread.UncaughtExceptionHandler {
private static Thread consumerThread = null;
public static volatile boolean resetConnection = false; public static volatile boolean resetConnection = false;
public static volatile int currentConsumer = 0; public static volatile int currentConsumer = 0;
public static volatile boolean isPaused = false; public static volatile boolean isPaused = false;
public static volatile boolean transacting = false; public static volatile boolean transacting = false;
public static volatile boolean interrupt = false; public static volatile boolean interrupt = false;
private static volatile boolean running = false;
protected static volatile boolean pausedSuccess = false; protected static volatile boolean pausedSuccess = false;
public static ConcurrentHashMap<Integer, ArrayList<Object[]>> consumer = new ConcurrentHashMap<>(4, 0.75f, 2); public static ConcurrentHashMap<Integer, ArrayList<Object[]>> consumer = new ConcurrentHashMap<>(4, 0.75f, 2);
@ -96,7 +96,7 @@ public class Consumer extends Process implements Runnable, Thread.UncaughtExcept
} }
public static boolean isRunning() { public static boolean isRunning() {
return running; return consumerThread != null && consumerThread.isAlive();
} }
private static void pauseConsumer(int process_id) { private static void pauseConsumer(int process_id) {
@ -120,7 +120,6 @@ public class Consumer extends Process implements Runnable, Thread.UncaughtExcept
@Override @Override
public void run() { public void run() {
running = true;
boolean lastRun = false; boolean lastRun = false;
while (ConfigHandler.serverRunning || ConfigHandler.converterRunning || !lastRun) { while (ConfigHandler.serverRunning || ConfigHandler.converterRunning || !lastRun) {
@ -145,20 +144,17 @@ public class Consumer extends Process implements Runnable, Thread.UncaughtExcept
errorDelay(); errorDelay();
} }
} }
running = false;
} }
@Override @Override
public void uncaughtException(Thread thread, Throwable e) { public void uncaughtException(Thread thread, Throwable e) {
running = false;
e.printStackTrace(); e.printStackTrace();
Bukkit.getPluginManager().disablePlugin(CoreProtect.getInstance()); Bukkit.getPluginManager().disablePlugin(CoreProtect.getInstance());
} }
public static void startConsumer() { public static void startConsumer() {
if (running == false) { if (!isRunning()) {
Thread consumerThread = new Thread(new Consumer()); consumerThread = new Thread(new Consumer());
consumerThread.setUncaughtExceptionHandler(new Consumer()); consumerThread.setUncaughtExceptionHandler(new Consumer());
consumerThread.start(); consumerThread.start();
} }