Jenkins should terminate cleanly on SIGTERM (jenkinsci#6230)

(cherry picked from commit 1a42044)
MarkEWaite · Mar 4, 2022 · 3097bb6 · 3097bb6
1 parent 256d373
commit 3097bb6
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/core/src/main/java/hudson/lifecycle/Lifecycle.java b/core/src/main/java/hudson/lifecycle/Lifecycle.java
@@ -55,6 +55,19 @@
 public abstract class Lifecycle implements ExtensionPoint {
     private static Lifecycle INSTANCE = null;
 
+    public Lifecycle() {
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            Jenkins jenkins = Jenkins.getInstanceOrNull();
+            if (jenkins != null) {
+                try {
+                    jenkins.cleanUp();
+                } catch (Throwable t) {
+                    LOGGER.log(Level.SEVERE, "Failed to clean up. Shutdown will continue.", t);
+                }
+            }
+        }));
+    }
+
     /**
      * Gets the singleton instance.
      *