[FIXED JENKINS-11742] don't change PID when a daemon is restarting

(cherry picked from commit f3566d1) Conflicts: changelog.html
jenkinsci · Dec 14, 2011 · 3bf2e4f · 3bf2e4f
1 parent 0ab36d3
commit 3bf2e4f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/changelog.html b/changelog.html
@@ -58,6 +58,8 @@
   <li class=bug>
     Fixed the OutOfMemoryError in trying to download/install JDK
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10689">issue 10689</a>)
+    If running as a daemon, don't daemonize one more time during restart.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11742">issue 11742</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java
@@ -52,6 +52,9 @@ public class UnixLifecycle extends Lifecycle {
     public UnixLifecycle() throws IOException {
         try {
             args = JavaVMArguments.current();
+
+            // if we are running as daemon, don't fork into background one more time during restart
+            args.remove("--daemon");
         } catch (UnsupportedOperationException e) {
             // can't restart
             failedToObtainArgs = e;