From 750458e491bd9a306875b284b8e1f42358116261 Mon Sep 17 00:00:00 2001 From: Ry Biesemeyer Date: Fri, 17 Apr 2026 15:54:31 +0000 Subject: [PATCH] fix forced-shutdown (double SIGINT) behaviour for JRuby 10 --- logstash-core/src/main/java/org/logstash/Logstash.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/logstash-core/src/main/java/org/logstash/Logstash.java b/logstash-core/src/main/java/org/logstash/Logstash.java index 94c25d3f40..e24d9b6491 100644 --- a/logstash-core/src/main/java/org/logstash/Logstash.java +++ b/logstash-core/src/main/java/org/logstash/Logstash.java @@ -117,7 +117,9 @@ public static void main(final String... args) { private static void installGlobalUncaughtExceptionHandler() { Thread.setDefaultUncaughtExceptionHandler((thread, e) -> { - if (e instanceof Error) { + if (e instanceof org.jruby.exceptions.SystemExit) { + halt(1); + } else if (e instanceof Error) { handleFatalError("uncaught error (in thread " + thread.getName() + ")", e); } else { LOGGER.error("uncaught exception (in thread " + thread.getName() + ")", e);