diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-12 15:29:57 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-12 15:29:57 +0200 |
| commit | 3166381a9020db85e45bfef8ebea9f841736af69 (patch) | |
| tree | b78c6b8222bd2e6d9bf525ba053644761b78a641 /server/sonar-process-monitor | |
| parent | 008297c01720142798feb575d7caa09b5f0db485 (diff) | |
| download | sonarqube-3166381a9020db85e45bfef8ebea9f841736af69.tar.gz sonarqube-3166381a9020db85e45bfef8ebea9f841736af69.zip | |
SONAR-4898 simplify MonitoredProcess implementations
Diffstat (limited to 'server/sonar-process-monitor')
2 files changed, 2 insertions, 1 deletions
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/RmiJmxConnector.java b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/RmiJmxConnector.java index ec8dba2902a..876ccc2b22f 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/RmiJmxConnector.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/RmiJmxConnector.java @@ -19,6 +19,7 @@ */ package org.sonar.process.monitor; +import org.slf4j.LoggerFactory; import org.sonar.process.JmxUtils; import org.sonar.process.LoopbackAddress; import org.sonar.process.ProcessMXBean; @@ -92,6 +93,7 @@ class RmiJmxConnector implements JmxConnector { execute(new Callable() { @Override public Void call() throws Exception { + LoggerFactory.getLogger(getClass()).info("Request termination of " + processRef); mbeans.get(processRef).terminate(); return null; } diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/TerminatorThread.java b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/TerminatorThread.java index f0943086877..f5b11b3148f 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/TerminatorThread.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/TerminatorThread.java @@ -48,7 +48,6 @@ class TerminatorThread extends Thread { final ProcessRef processRef = processes.get(index); if (!processRef.isTerminated()) { processRef.setPingEnabled(false); - try { jmxConnector.terminate(processRef, timeouts.getTerminationTimeout()); } catch (Exception ignored) { |