diff options
| author | Eric Hartmann <hartmann.eric@gmail.com> | 2015-02-19 18:58:59 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-02-20 19:07:28 +0100 |
| commit | 2b5e9191374d82eeed8f07fa4940aeee75ff4bdb (patch) | |
| tree | ae313cfb234cda831e667d1ffe755c875e434b73 /sonar-application | |
| parent | a46fb632283502280fe79d7908068f579a5dbba2 (diff) | |
| download | sonarqube-2b5e9191374d82eeed8f07fa4940aeee75ff4bdb.tar.gz sonarqube-2b5e9191374d82eeed8f07fa4940aeee75ff4bdb.zip | |
SONAR-6036 use IPC (Inter Process Communication) for monitoring
processes
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/src/main/assembly/conf/wrapper.conf | 1 | ||||
| -rw-r--r-- | sonar-application/src/main/java/org/sonar/application/App.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf index 86834b8a80b..530e560b787 100644 --- a/sonar-application/src/main/assembly/conf/wrapper.conf +++ b/sonar-application/src/main/assembly/conf/wrapper.conf @@ -86,3 +86,4 @@ wrapper.ntservice.interactive=false wrapper.disable_restarts=TRUE wrapper.ping.timeout=0 wrapper.shutdown.timeout=3000 +wrapper.jvm_exit.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 e70c34df4fe..f5418d42ab8 100644 --- a/sonar-application/src/main/java/org/sonar/application/App.java +++ b/sonar-application/src/main/java/org/sonar/application/App.java @@ -28,6 +28,7 @@ import org.sonar.process.Props; import org.sonar.process.StopWatcher; import org.sonar.process.Stoppable; import org.sonar.process.monitor.JavaCommand; +import org.sonar.process.monitor.KnownJavaCommand; import org.sonar.process.monitor.Monitor; import java.io.File; @@ -53,9 +54,8 @@ public class App implements Stoppable { public void start(Props props) { if (props.valueAsBoolean(ProcessConstants.ENABLE_STOP_COMMAND, false)) { - // stop application when file <temp>/app.stop is created File tempDir = props.nonNullValueAsFile(ProcessConstants.PATH_TEMP); - ProcessCommands commands = new ProcessCommands(tempDir, "app"); + ProcessCommands commands = new ProcessCommands(tempDir, KnownJavaCommand.APP.getIndex()); stopWatcher = new StopWatcher(commands, this); stopWatcher.start(); } |