System-End/Discord-MC-Chat
1
0
Fork 0
mirror of https://github.com/System-End/Discord-MC-Chat.git synced 2026-04-20 00:25:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve OkHttpClient shutdown logic for graceful termination

Browse source
This commit is contained in:
Xujiayao 2025-12-20 01:01:39 +08:00
parent f35ef492bb
commit 7202c3e93e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/com/xujiayao/discord_mc_chat/DMCC.java
View file

@ -146,11 +146,16 @@ public class DMCC {
// Shutdown OkHttpClient
try (ExecutorService executorService = OK_HTTP_CLIENT.dispatcher().executorService();
Cache ignored = OK_HTTP_CLIENT.cache()) {
Cache ignored1 = OK_HTTP_CLIENT.cache()) {
executorService.shutdown();
if (!executorService.awaitTermination(5, TimeUnit.SECONDS)) {
executorService.shutdownNow(); // Force shutdown if not terminated gracefully
if (ConfigManager.getBoolean("shutdown.graceful_shutdown")) {
// Allow up to 30 minutes for ongoing requests to complete
boolean ignored2 = executorService.awaitTermination(30, TimeUnit.MINUTES);
} else {
// Allow up to 5 seconds for ongoing requests to complete
boolean ignored2 = executorService.awaitTermination(5, TimeUnit.SECONDS);
}
executorService.shutdownNow();
OK_HTTP_CLIENT.connectionPool().evictAll();
} catch (Exception e) {
LOGGER.error("An error occurred during OkHttpClient shutdown", e);