Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-04-12 19:46:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add waiting for console processing to be done in shutdown, check to not queue stuff when console handler is shutdown

Browse Source
This commit is contained in:
Vankka 2023-10-06 22:42:31 +03:00
parent 812f459d93
commit e0bee7e2d8
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/discordsrv/common/console/SingleConsoleHandler.java
View File

@ -43,6 +43,7 @@ public class SingleConsoleHandler {
private final ConsoleConfig config; private final ConsoleConfig config;
private final Queue<LogEntry> queue = new LinkedBlockingQueue<>(); private final Queue<LogEntry> queue = new LinkedBlockingQueue<>();
private Future<?> queueProcessingFuture; private Future<?> queueProcessingFuture;
private boolean shutdown = false;
// Editing // Editing
private final List<LogMessage> messageCache; private final List<LogMessage> messageCache;
@ -163,8 +164,14 @@ public class SingleConsoleHandler {
} }
public void shutdown() { public void shutdown() {
shutdown = true;
discordSRV.eventBus().unsubscribe(this); discordSRV.eventBus().unsubscribe(this);
queueProcessingFuture.cancel(false); queueProcessingFuture.cancel(false);
try {
queueProcessingFuture.wait(TimeUnit.SECONDS.toMillis(3));
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
queue.clear(); queue.clear();
if (messageCache != null) { if (messageCache != null) {
messageCache.clear(); messageCache.clear();
@ -173,6 +180,9 @@ public class SingleConsoleHandler {
} }
private void timeQueueProcess() { private void timeQueueProcess() {
if (shutdown) {
return;
}
this.queueProcessingFuture = discordSRV.scheduler().runLater(this::processQueue, 2, TimeUnit.SECONDS); this.queueProcessingFuture = discordSRV.scheduler().runLater(this::processQueue, 2, TimeUnit.SECONDS);
} }