From d11e245197ec1fb630c73092cd90023a0ce719d0 Mon Sep 17 00:00:00 2001 From: Stephane Gamard Date: Fri, 8 Aug 2014 09:59:58 +0200 Subject: [PATCH] SONAR-4898 - Robustness (scheduled rate rather than delay). --- fork.sh | 4 ++-- .../src/main/java/org/sonar/process/Monitor.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fork.sh b/fork.sh index 91bb07a3e20..6a0cad70879 100755 --- a/fork.sh +++ b/fork.sh @@ -1,6 +1,6 @@ #!/bin/sh -mvn clean install -DskipTests -pl :sonar-search,:sonar-application -amd +mvn clean install -DskipTests -pl :sonar-process -amd if [[ "$OSTYPE" == "darwin"* ]]; then OS='macosx-universal-64' @@ -18,7 +18,7 @@ touch logs/application.log touch logs/search.log touch logs/sonar.log -tmux new-session "tmux split-window -v 'tail -f logs/sonar.log'; tmux split-window -h 'tail -f logs/search.log'; java -jar lib/sonar-application*.jar" +tmux new-session "tmux split-window -v 'tail -f logs/sonar.log'; tmux split-window -h 'tail -f logs/search.log'; java -jar lib/sonar-application*.jar -Dsonar.node.name=forky" #tmux new-session "tmux split-window -h 'tail -f logs/search.log'; java -jar lib/sonar-application*.jar" #tmux new-session "tmux split-window -v 'tail -f logs/sonar.log'; tmux split-window -h 'tail -f logs/search.log'; tail -f logs/application.log" diff --git a/server/sonar-process/src/main/java/org/sonar/process/Monitor.java b/server/sonar-process/src/main/java/org/sonar/process/Monitor.java index 2e18a3b9d35..d12e0f7e757 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/Monitor.java +++ b/server/sonar-process/src/main/java/org/sonar/process/Monitor.java @@ -87,7 +87,7 @@ public class Monitor extends Thread implements Terminable { boolean ok = true; while (ok) { for (ProcessWrapper process : processes) { - if (process.isAlive()) { + if (!ProcessUtils.isAlive(process.process())) { LOGGER.info("{} is down, stopping all other processes", process.getName()); ok = false; interrupt(); -- 2.39.5