opendev/gerrit
Code Issues Proposed changes

Merge "Catch daemon startup failures in error_log"

Browse Source
This commit is contained in:
Shawn O. Pearce
2010-03-02 22:27:18 -08:00
committed by Android Code Review
parent 5997561c19 807b6b5157
commit 14982c2f2e
1 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
View File

@@ -116,6 +116,7 @@ public class Daemon extends SiteProgram {
manager.add(ErrorLogFile.start(getSitePath())); manager.add(ErrorLogFile.start(getSitePath()));
} }
try {
dbInjector = createDbInjector(MULTI_USER); dbInjector = createDbInjector(MULTI_USER);
cfgInjector = createCfgInjector(); cfgInjector = createCfgInjector();
sysInjector = createSysInjector(); sysInjector = createSysInjector();
@@ -159,6 +160,10 @@ public class Daemon extends SiteProgram {
RuntimeShutdown.waitFor(); RuntimeShutdown.waitFor();
return 0; return 0;
} catch (Throwable err) {
log.error("Unable to start daemon", err);
return 1;
}
} }
private String myVersion() { private String myVersion() {