This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.8 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit a03609cd0c641e5da1eb434205d7dbd84b9b98af Author: litao <[email protected]> AuthorDate: Sat Nov 6 11:14:31 2021 +0800 [pulsar-broker] Add git branch information for PulsarVersion (#12541) (cherry picked from commit bc8e40c7c26791ea5e030eb790318f8443014887) --- .../src/main/java/org/apache/pulsar/broker/PulsarService.java | 1 + .../src/main/java-templates/org/apache/pulsar/PulsarVersion.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java index 23f50b6..ba5a90b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java @@ -585,6 +585,7 @@ public class PulsarService implements AutoCloseable { LOG.info("Starting Pulsar Broker service; version: '{}'", (brokerVersion != null ? brokerVersion : "unknown")); LOG.info("Git Revision {}", PulsarVersion.getGitSha()); + LOG.info("Git Branch {}", PulsarVersion.getGitBranch()); LOG.info("Built by {} on {} at {}", PulsarVersion.getBuildUser(), PulsarVersion.getBuildHost(), diff --git a/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java b/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java index 07f97cd..e1e57e1 100644 --- a/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java +++ b/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java @@ -82,6 +82,10 @@ public class PulsarVersion { } } + public static String getGitBranch() { + return "${git.branch}"; + } + public static String getBuildUser() { String email = "${git.build.user.email}"; String name = "${git.build.user.name}";
