opendev
/
gerrit
Code Issues Proposed changes

Daemon: Show status of slave and headless mode in 'ready' log 

When slave mode or headless mode is activated, include '[slave]'
and '[headless]' respectively in the 'ready' info log.

Change-Id: I5789b22d32e0260cb676a91d375e919838d642a1
This commit is contained in:
David Pursehouse 2019-02-07 17:15:09 +09:00
parent 5b2d3e6e8a
commit 57e4afc99f
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,10 +15,12 @@
package com.google.gerrit.pgm;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.gerrit.common.Version.getVersion;
import static com.google.gerrit.server.schema.DataSourceProvider.Context.MULTI_USER;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import com.google.common.base.MoreObjects;
import com.google.gerrit.audit.AuditModule;
import com.google.gerrit.common.EventBroker;
@ -369,7 +371,15 @@ public class Daemon extends SiteProgram {
}
private String myVersion() {
return com.google.gerrit.common.Version.getVersion();
List<String> versionParts = new ArrayList<>();
if (slave) {
versionParts.add("[slave]");
}
if (headless) {
versionParts.add("[headless]");
}
versionParts.add(getVersion());
return Joiner.on(" ").join(versionParts);
}
private Injector createCfgInjector() {