SONAR-4898 - fix early termination leaves search server as ghost

2 files changed, 4 insertions, 4 deletions

diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf
index bb200e7161b..2fb5f96c844 100644
--- a/sonar-application/src/main/assembly/conf/wrapper.conf
+++ b/sonar-application/src/main/assembly/conf/wrapper.conf
@@ -85,4 +85,4 @@ wrapper.ntservice.interactive=false
 #********************************************************************
 wrapper.disable_restarts=TRUE
 wrapper.ping.timeout=0
-wrapper.shutdown.timeout=300
+wrapper.shutdown.timeout=3000
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java
index 23293a2efed..e4c5abcac51 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -96,16 +96,15 @@ public class App implements ProcessMXBean {
               if (server.waitForReady()) {
                 success = true;
                 logger.info("web server is up");
-                monitor.join();
               }
             }
           } else {
             success = true;
-            monitor.join();
           }
         }
       }
     } finally {
+      monitor.join();
       terminate();
     }
   }
@@ -160,11 +159,12 @@ public class App implements ProcessMXBean {
     }
 
     App app = new App();
+    ProcessUtils.addSelfShutdownHook(app);
     try {
       // start and wait for shutdown command
       if (props.contains(SearchServer.ES_CLUSTER_INET)) {
         LoggerFactory.getLogger(App.class).info("SonarQube slave configured to join SonarQube master : {}", props.value(SearchServer.ES_CLUSTER_INET));
-      }
+    }
       app.start(props);
     } catch (InterruptedException e) {
       LoggerFactory.getLogger(App.class).info("interrupted");