diff options
author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-07-30 18:04:58 +0200 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-07-30 18:04:58 +0200 |
commit | 1be85fe80d23502a0cc0f61a6d53b50dc32c0ceb (patch) | |
tree | 4862e5564f23e9542c68dadbad1b167bfb1ff7e1 /sonar-application/src/main/java/org/sonar/application | |
parent | 019079b710f70ce19a449c0d6d209ecc2569a00a (diff) | |
download | sonarqube-1be85fe80d23502a0cc0f61a6d53b50dc32c0ceb.tar.gz sonarqube-1be85fe80d23502a0cc0f61a6d53b50dc32c0ceb.zip |
SONAR-4898 fix logs
Diffstat (limited to 'sonar-application/src/main/java/org/sonar/application')
-rw-r--r-- | sonar-application/src/main/java/org/sonar/application/App.java | 9 |
1 files changed, 6 insertions, 3 deletions
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 daf1e53c205..dcfa2126811 100644 --- a/sonar-application/src/main/java/org/sonar/application/App.java +++ b/sonar-application/src/main/java/org/sonar/application/App.java @@ -60,7 +60,7 @@ public class App implements ProcessMXBean { if (elasticsearch.execute()) { monitor.registerProcess(elasticsearch); if (elasticsearch.waitForReady()) { - logger.info("Search server is ready"); + logger.info("search server is up"); server = new ProcessWrapper(JmxUtils.WEB_SERVER_NAME) .setWorkDir(installation.homeDir()) @@ -81,7 +81,7 @@ public class App implements ProcessMXBean { monitor.registerProcess(server); if (server.waitForReady()) { success = true; - logger.info("Web server is ready"); + logger.info("web server is up"); monitor.join(); } } @@ -104,7 +104,6 @@ public class App implements ProcessMXBean { @Override public void terminate() { - LoggerFactory.getLogger(App.class).info("Stopping"); if (monitor != null && monitor.isAlive()) { monitor.terminate(); monitor.interrupt(); @@ -128,7 +127,11 @@ public class App implements ProcessMXBean { Installation installation = new Installation(); new AppLogging().configure(installation); App app = new App(installation); + + // start and wait for shutdown command app.start(); + + LoggerFactory.getLogger(App.class).info("stopped"); System.exit(app.isSuccess() ? 0 : 1); } } |