From e249f157f5963cfc458eca1988fb970f086ced72 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Tue, 30 Dec 2014 16:48:57 +0000 Subject: QPID-6293: [Java Broker] Log Java Broker's pid on startup * Log the process identifer on startup as an operational log message * Wired up the Broker attribute Broker#processPid git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1648545 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/logging/messages/BrokerMessages.java | 34 ++++++++++++++++++++++ .../logging/messages/Broker_logmessages.properties | 5 +++- .../qpid/server/model/AbstractSystemConfig.java | 5 ++++ .../qpid/server/model/adapter/BrokerAdapter.java | 3 +- 4 files changed, 44 insertions(+), 3 deletions(-) (limited to 'qpid/java/broker-core/src') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java index cd21f533a4..58f7dfe807 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java @@ -54,6 +54,7 @@ public class BrokerMessages public static final String FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.flow_to_disk_active"; public static final String MAX_MEMORY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.max_memory"; public static final String PLATFORM_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.platform"; + public static final String PROCESS_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.process"; public static final String SHUTTING_DOWN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.shutting_down"; public static final String MANAGEMENT_MODE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.management_mode"; public static final String STARTUP_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.startup"; @@ -73,6 +74,7 @@ public class BrokerMessages Logger.getLogger(FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY); Logger.getLogger(MAX_MEMORY_LOG_HIERARCHY); Logger.getLogger(PLATFORM_LOG_HIERARCHY); + Logger.getLogger(PROCESS_LOG_HIERARCHY); Logger.getLogger(SHUTTING_DOWN_LOG_HIERARCHY); Logger.getLogger(MANAGEMENT_MODE_LOG_HIERARCHY); Logger.getLogger(STARTUP_LOG_HIERARCHY); @@ -397,6 +399,38 @@ public class BrokerMessages }; } + /** + * Log a Broker message of the Format: + * 
BRK-1017 : Process : PID : {0}
+ * Optional values are contained in [square brackets] and are numbered + * sequentially in the method call. + * + */ + public static LogMessage PROCESS(String param1) + { + String rawMessage = _messages.getString("PROCESS"); + + final Object[] messageArguments = {param1}; + // Create a new MessageFormat to ensure thread safety. + // Sharing a MessageFormat and using applyPattern is not thread safe + MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + + final String message = formatter.format(messageArguments); + + return new LogMessage() + { + public String toString() + { + return message; + } + + public String getLogHierarchy() + { + return PROCESS_LOG_HIERARCHY; + } + }; + } + /** * Log a Broker message of the Format: * 
BRK-1003 : Shutting down : {0} port {1,number,#}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties index 322335a956..92417b6764 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties @@ -54,4 +54,7 @@ MANAGEMENT_MODE = BRK-1012 : Management Mode : User Details : {0} / {1} FLOW_TO_DISK_ACTIVE = BRK-1014 : Message flow to disk active : Message memory use {0,number,#}KB exceeds threshold {1,number,#.##}KB FLOW_TO_DISK_INACTIVE = BRK-1015 : Message flow to disk inactive : Message memory use {0,number,#}KB within threshold {1,number,#.##}KB -FATAL_ERROR = BRK-1016 : Fatal error : {0} : See log file for more information \ No newline at end of file +FATAL_ERROR = BRK-1016 : Fatal error : {0} : See log file for more information + +# 0 - pid +PROCESS = BRK-1017 : Process : PID : {0} \ No newline at end of file diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java index 19918abb14..b421c5aaf1 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java @@ -224,6 +224,11 @@ public abstract class AbstractSystemConfig> startupLogger.message(BrokerMessages.MAX_MEMORY(Runtime.getRuntime().maxMemory())); + if (SystemUtils.getProcessPid() != null) + { + startupLogger.message(BrokerMessages.PROCESS(SystemUtils.getProcessPid())); + } + BrokerStoreUpgraderAndRecoverer upgrader = new BrokerStoreUpgraderAndRecoverer(this); upgrader.perform(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java index ac14308d2d..5975d64f19 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java @@ -316,8 +316,7 @@ public class BrokerAdapter extends AbstractConfiguredObject imple @Override public String getProcessPid() { - // TODO - return null; + return SystemUtils.getProcessPid(); } @Override -- cgit v1.2.1