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

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

@@ -116,49 +116,54 @@ public class Daemon extends SiteProgram {
manager.add(ErrorLogFile.start(getSitePath()));
}
dbInjector = createDbInjector(MULTI_USER);
cfgInjector = createCfgInjector();
sysInjector = createSysInjector();
manager.add(dbInjector, cfgInjector, sysInjector);
try {
dbInjector = createDbInjector(MULTI_USER);
cfgInjector = createCfgInjector();
sysInjector = createSysInjector();
manager.add(dbInjector, cfgInjector, sysInjector);
if (sshd) {
initSshd();
}
if (httpd) {
initHttpd();
}
manager.start();
RuntimeShutdown.add(new Runnable() {
public void run() {
log.info("caught shutdown, cleaning up");
if (runId != null) {
runFile.delete();
}
manager.stop();
if (sshd) {
initSshd();
}
});
log.info("Gerrit Code Review " + myVersion() + " ready");
if (runId != null) {
try {
runFile.createNewFile();
runFile.setReadable(true, false);
if (httpd) {
initHttpd();
}
FileOutputStream out = new FileOutputStream(runFile);
manager.start();
RuntimeShutdown.add(new Runnable() {
public void run() {
log.info("caught shutdown, cleaning up");
if (runId != null) {
runFile.delete();
}
manager.stop();
}
});
log.info("Gerrit Code Review " + myVersion() + " ready");
if (runId != null) {
try {
out.write((runId + "\n").getBytes("UTF-8"));
} finally {
out.close();
}
} catch (IOException err) {
log.warn("Cannot write --run-id to " + runFile, err);
}
}
runFile.createNewFile();
runFile.setReadable(true, false);
RuntimeShutdown.waitFor();
return 0;
FileOutputStream out = new FileOutputStream(runFile);
try {
out.write((runId + "\n").getBytes("UTF-8"));
} finally {
out.close();
}
} catch (IOException err) {
log.warn("Cannot write --run-id to " + runFile, err);
}
}
RuntimeShutdown.waitFor();
return 0;
} catch (Throwable err) {
log.error("Unable to start daemon", err);
return 1;
}
}
private String myVersion() {