Skip to content
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.

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

Avoiding app shutdown race condition #449

Merged
merged 1 commit into from
Jun 21, 2023
Merged
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions src/main/java/org/datadog/jmxfetch/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,13 @@ public int run() {
// set up the config status
this.appConfig.updateStatus();

// Adding another shutdown hook for App related tasks
Runtime.getRuntime().addShutdownHook(new AppShutdownHook(this));
try {
// Adding another shutdown hook for App related tasks
Runtime.getRuntime().addShutdownHook(new AppShutdownHook(this));
} catch (IllegalStateException illegalStateException) {
// this exception is thrown if shutdown is already happening when the hook is added
return 0;
}

// Get config from the ipc endpoint for "list_*" actions
if (!action.equals(AppConfig.ACTION_COLLECT)) {
Expand Down