Skip to content

feat: adding stop() method #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

feat: adding stop() method #100

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4d9dda7
feat: adding stop() method to interrupt and close all pools and conne…
mennafabio May 17, 2024
bd12c5f
build: spotless changes
mennafabio May 19, 2024
e9264f3
refactor: adjusting type of EXECUTOR
mennafabio May 19, 2024
8fb4750
feat(logger): adding log to stop() method
mennafabio May 19, 2024
7700b22
refactor(spotless): apply formatting
mennafabio May 19, 2024
b0edfa9
feat: introducing new boolean which checks if appIsActive or not.
mennafabio May 20, 2024
812698a
feat(wip): introducing AtomicBoolean for thread-safety. Adjusting sto…
mennafabio May 20, 2024
92e54e4
fix: adjusting catch, removing additional shutdown of threadpool.
mennafabio May 20, 2024
f3d0c8a
fix: AtomicBoolean and dispatcher stop in method as commented
mennafabio May 20, 2024
2ed4090
feat: adjusting log
mennafabio May 20, 2024
0bfefa2
feat: adjusting bool, removing todo
mennafabio May 20, 2024
c021407
feat: adjusting log level
mennafabio May 20, 2024
8f05b91
Merge branch 'javadiscord:main' into feature/stopMethod
mennafabio May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions core/src/main/java/com/javadiscord/jdi/core/Discord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;

public class Discord {
private static final Logger LOGGER = LogManager.getLogger();
Expand All @@ -45,6 +47,7 @@ public class Discord {
private final List<Object> annotatedEventListeners = new ArrayList<>();
private final List<EventListener> eventListeners = new ArrayList<>();

private WebSocketManager webSocketManager;
private Object listenerLoader;

public Discord(String botToken) {
Expand Down Expand Up @@ -134,13 +137,14 @@ private void loadAnnotations() {
}

public void start() {
WebSocketManager webSocketManager =
this.webSocketManager =
new WebSocketManager(
new GatewaySetting().setApiVersion(10).setEncoding(GatewayEncoding.JSON),
identifyRequest,
cache);

WebSocketManagerProxy webSocketManagerProxy = new WebSocketManagerProxy(webSocketManager);
WebSocketManagerProxy webSocketManagerProxy =
new WebSocketManagerProxy(this.webSocketManager);
ConnectionDetails connectionDetails =
new ConnectionDetails(gateway.url(), botToken, gatewaySetting);
ConnectionMediator connectionMediator =
Expand All @@ -152,6 +156,27 @@ public void start() {
EXECUTOR.execute(discordRequestDispatcher);
}

public void stop() {
if (this.webSocketManager != null) {
this.webSocketManager.stop();
}

ThreadPoolExecutor threadPool = (ThreadPoolExecutor) EXECUTOR;
if (threadPool.getPoolSize() > 0) threadPool.shutdown();

try {
if (!threadPool.awaitTermination(30, TimeUnit.SECONDS)) {
threadPool.shutdownNow();
if (!threadPool.awaitTermination(30, TimeUnit.SECONDS)) {
LOGGER.error("Threads not terminated properly");
}
}
} catch (InterruptedException ie) {
threadPool.shutdownNow();
Thread.currentThread().interrupt();
}
}

public void startWithoutGatewayEvents() {
EXECUTOR.execute(discordRequestDispatcher);
}
Expand Down