QPID-3842: Java Broker should report platform and memory size on startup

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1244276 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 62 insertions, 5 deletions

diff --git a/doc/book/src/Java-Broker-StatusLogMessages.xml b/doc/book/src/Java-Broker-StatusLogMessages.xml
index e905f9ff10..98f876e532 100644
--- a/doc/book/src/Java-Broker-StatusLogMessages.xml
+++ b/doc/book/src/Java-Broker-StatusLogMessages.xml
@@ -216,7 +216,7 @@
                </para>     
             
             <para>Property:</para>
-            <programlisting><![CDATA[SHUTTING_DOWN = BRK-1003 : Shuting down : {0} port {1,number,}]]></programlisting>                      
+            <programlisting><![CDATA[SHUTTING_DOWN = BRK-1003 : Shutting down : {0} port {1,number,}]]></programlisting>
             <para>becomes Method:</para>
             <programlisting><![CDATA[public static LogMessage SHUTTING_DOWN(String param1, Number param2)]]>
             </programlisting>
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties b/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
index 5d1e85fe41..1aa7815c39 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
+++ b/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
@@ -26,7 +26,7 @@ STARTUP = BRK-1001 : Startup : Version: {0} Build: {1}
 LISTENING = BRK-1002 : Starting : Listening on {0} port {1,number,#}
 # 0 - Transport
 # 1 - Port
-SHUTTING_DOWN = BRK-1003 : Shuting down : {0} port {1,number,#}
+SHUTTING_DOWN = BRK-1003 : Shutting down : {0} port {1,number,#}
 READY = BRK-1004 : Qpid Broker Ready
 STOPPED = BRK-1005 : Stopped
 # 0 - path
@@ -35,4 +35,14 @@ CONFIG = BRK-1006 : Using configuration : {0}
 LOG_CONFIG = BRK-1007 : Using logging configuration : {0}
 
 STATS_DATA = BRK-1008 : {0,choice,0#delivered|1#received} : {1,number,#.###} kB/s peak : {2,number,#} bytes total
-STATS_MSGS = BRK-1009 : {0,choice,0#delivered|1#received} : {1,number,#.###} msg/s peak : {2,number,#} msgs total
\ No newline at end of file
+STATS_MSGS = BRK-1009 : {0,choice,0#delivered|1#received} : {1,number,#.###} msg/s peak : {2,number,#} msgs total
+
+# 0 - java vendor
+# 1 - java runtime version
+# 2 - os name
+# 3 - os type
+# 4 - os architecture
+PLATFORM = BRK-1010 : Platform : JVM : {0} version: {1} OS : {2} version: {3} arch: {4}
+
+# 0 Maximum Memory
+MAX_MEMORY = BRK-1011 : Maximum Memory : {0,number} bytes
\ No newline at end of file
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
index 99a80ddff8..224d694932 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
@@ -37,6 +37,7 @@ import org.apache.qpid.server.configuration.SystemConfigImpl;
 import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.logging.CompositeStartupMessageLogger;
 import org.apache.qpid.server.logging.Log4jMessageLogger;
+import org.apache.qpid.server.logging.LogActor;
 import org.apache.qpid.server.logging.RootMessageLogger;
 import org.apache.qpid.server.logging.SystemOutMessageLogger;
 import org.apache.qpid.server.logging.actors.AbstractActor;
@@ -327,7 +328,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
 
             _qmfService = new QMFService(getConfigStore(), this);
 
-            CurrentActor.get().message(BrokerMessages.STARTUP(QpidProperties.getReleaseVersion(), QpidProperties.getBuildVersion()));
+            logStartupMessages(CurrentActor.get());
 
             _virtualHostRegistry = new VirtualHostRegistry(this);
 
@@ -356,6 +357,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
         }
     }
 
+
     /**
      * Iterates across all discovered authentication manager factories, offering the security configuration to each.
      * Expects <b>exactly</b> one authentication manager to configure and initialise itself.
@@ -739,4 +741,18 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
     {
         _statisticsEnabled = enabled;
     }
+
+    private void logStartupMessages(LogActor logActor)
+    {
+        logActor.message(BrokerMessages.STARTUP(QpidProperties.getReleaseVersion(), QpidProperties.getBuildVersion()));
+
+        logActor.message(BrokerMessages.PLATFORM(System.getProperty("java.vendor"),
+                                                 System.getProperty("java.runtime.version", System.getProperty("java.version")),
+                                                 System.getProperty("os.name"),
+                                                 System.getProperty("os.version"),
+                                                 System.getProperty("os.arch")));
+
+        logActor.message(BrokerMessages.MAX_MEMORY(Runtime.getRuntime().maxMemory()));
+    }
+
 }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
index a3d46f5716..e87d292471 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
@@ -22,6 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import java.util.List;
 
+import org.apache.derby.iapi.services.io.FileUtil;
+
 /**
  * Test BRK log Messages
  */
@@ -64,7 +66,7 @@ public class BrokerMessagesTest extends AbstractTestMessages
 
         List<Object> log = performLog();
 
-        String[] expected = {"Shuting down", transport, "port ", String.valueOf(port)};
+        String[] expected = {"Shutting down", transport, "port ", String.valueOf(port)};
 
         validateLogMessage(log, "BRK-1003", expected);
     }
@@ -113,4 +115,33 @@ public class BrokerMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "BRK-1007", expected);
     }
 
+    public void testBrokerPlatform()
+    {
+        String javaVendor = "jvendor";
+        String javaVersion = "j1.0";
+
+        String osName = "os";
+        String osVersion = "o1.0";
+        String osArch = "oarch";
+
+        _logMessage = BrokerMessages.PLATFORM(javaVendor, javaVersion, osName, osVersion, osArch);
+        List<Object> log = performLog();
+
+        String[] expected = {"Platform :", "JVM :", javaVendor, " version: ", " OS : ", osName, " version: ", osVersion, " arch: ", osArch};
+
+        validateLogMessage(log, "BRK-1010", expected);
+    }
+
+    public void testBrokerMemory()
+    {
+        long oneGiga = 1024*1024*1024;
+
+        _logMessage = BrokerMessages.MAX_MEMORY(oneGiga);
+        List<Object> log = performLog();
+
+        String[] expected = {"Maximum Memory :", "1,073,741,824", "bytes"};
+
+        validateLogMessage(log, "BRK-1011", expected);
+    }
+
 }