[activemq-artemis] branch main updated: ARTEMIS-4134: list the version in initial boostrap log message, make it available earlier and more obviously/reliably than later message after startup

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 9ff5c0f426 ARTEMIS-4134: list the version in initial boostrap log message, make it available earlier and more obviously/reliably than later message after startup
9ff5c0f426 is described below

commit 9ff5c0f426922c481f7ced49fc241915c64e7704
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Jan 17 13:31:40 2023 +0000

    ARTEMIS-4134: list the version in initial boostrap log message, make it available earlier and more obviously/reliably than later message after startup
---
 .../main/java/org/apache/activemq/artemis/integration/FileBroker.java | 4 +++-
 .../artemis/integration/bootstrap/ActiveMQBootstrapLogger.java        | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
index 0eb627bf61..26b1b87a26 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
@@ -30,6 +30,7 @@ import org.apache.activemq.artemis.core.server.ServiceComponent;
 import org.apache.activemq.artemis.dto.ServerDTO;
 import org.apache.activemq.artemis.integration.bootstrap.ActiveMQBootstrapLogger;
 import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.artemis.utils.VersionLoader;
 
 public class FileBroker implements Broker {
 
@@ -59,7 +60,8 @@ public class FileBroker implements Broker {
       }
 
       ArrayList<ActiveMQComponent> componentsByStartOrder = getComponentsByStartOrder(components);
-      ActiveMQBootstrapLogger.LOGGER.serverStarting();
+      String fullVersion = VersionLoader.getVersion().getFullVersion();
+      ActiveMQBootstrapLogger.LOGGER.serverStarting(fullVersion);
       for (ActiveMQComponent component : componentsByStartOrder) {
          component.start();
       }
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
index 117465e635..0f6b9a52ae 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
@@ -28,8 +28,8 @@ public interface ActiveMQBootstrapLogger {
 
    ActiveMQBootstrapLogger LOGGER = BundleFactory.newBundle(ActiveMQBootstrapLogger.class, ActiveMQBootstrapLogger.class.getPackage().getName());
 
-   @LogMessage(id = 101000, value = "Starting ActiveMQ Artemis Server", level = LogMessage.Level.INFO)
-   void serverStarting();
+   @LogMessage(id = 101000, value = "Starting ActiveMQ Artemis Server version {}", level = LogMessage.Level.INFO)
+   void serverStarting(String version);
 
    @LogMessage(id = 101001, value = "Stopping ActiveMQ Artemis Server", level = LogMessage.Level.INFO)
    void serverStopping();