Merge "Catch daemon startup failures in error_log"

2010-03-02 22:27:18 -08:00
parent 5997561c19 807b6b5157
commit 14982c2f2e
1 changed files with 42 additions and 37 deletions
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -116,6 +116,7 @@ public class Daemon extends SiteProgram {
      manager.add(ErrorLogFile.start(getSitePath()));
    }

+    try {
      dbInjector = createDbInjector(MULTI_USER);
      cfgInjector = createCfgInjector();
      sysInjector = createSysInjector();
@@ -159,6 +160,10 @@ public class Daemon extends SiteProgram {

      RuntimeShutdown.waitFor();
      return 0;
+    } catch (Throwable err) {
+      log.error("Unable to start daemon", err);
+      return 1;
+    }
  }

  private String myVersion() {