diff options
author | David Pursehouse <dpursehouse@collab.net> | 2019-02-07 17:15:09 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2019-02-07 17:41:36 +0900 |
commit | 57e4afc99fc4480cbc2d3c881d63ad2c0358bedf (patch) | |
tree | 34bac3fc2567028f7c72427609e26f13aabb6540 | |
parent | 5b2d3e6e8aa999898f41b14d41555b7741b8dba7 (diff) |
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
-rw-r--r-- | gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java index eb244db6a6..4dd54ad922 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java @@ -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() { |