Improve error handling when server components fail to start

2 files changed, 14 insertions, 15 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
index fbe36cb9d3a..0d77871fa8b 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
@@ -109,12 +109,18 @@ public final class Platform {
 
   public void start() {
     if (!started && isUpToDateDatabase()) {
-      TimeProfiler profiler = new TimeProfiler().start("Start services");
-      startCoreComponents();
-      startServiceComponents();
-      executeStartupTasks();
-      started = true;
-      profiler.stop();
+      try {
+        TimeProfiler profiler = new TimeProfiler().start("Start services");
+        startCoreComponents();
+        startServiceComponents();
+        executeStartupTasks();
+        started = true;
+        profiler.stop();
+      } catch (Exception e) {
+        // full stacktrace is lost by jruby. It must be logged now.
+        LoggerFactory.getLogger(getClass()).error("Fail to start server", e);
+        throw new IllegalStateException("Fail to start server", e);
+      }
     }
   }
 
diff --git a/sonar-server/src/main/java/org/sonar/server/platform/PlatformLifecycleListener.java b/sonar-server/src/main/java/org/sonar/server/platform/PlatformLifecycleListener.java
index f886c944c6e..1837223ae1b 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/PlatformLifecycleListener.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/PlatformLifecycleListener.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.platform;
 
-import org.slf4j.LoggerFactory;
 import org.sonar.core.config.Logback;
 
 import javax.servlet.ServletContextEvent;
@@ -30,14 +29,8 @@ public final class PlatformLifecycleListener implements ServletContextListener {
 
   public void contextInitialized(ServletContextEvent event) {
     configureLogback();
-    try {
-      Platform.getInstance().init(event.getServletContext());
-      Platform.getInstance().start();
-    } catch (Exception e) {
-      // full stacktrace is lost by jruby-rack. It must be logged now.
-      LoggerFactory.getLogger(getClass()).error("Fail to start server", e);
-      throw new IllegalStateException("Fail to start server", e);
-    }
+    Platform.getInstance().init(event.getServletContext());
+    Platform.getInstance().start();
   }
 
   public void contextDestroyed(ServletContextEvent event) {