You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/10/10 22:47:27 UTC
[1/2] activemq-artemis git commit: This closes #2343
Repository: activemq-artemis
Updated Branches:
refs/heads/master c035c5516 -> 714a3f862
This closes #2343
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/714a3f86
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/714a3f86
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/714a3f86
Branch: refs/heads/master
Commit: 714a3f862ed959be44f969b4f12ddf558e5b68f6
Parents: c035c55 59ad650
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Oct 10 18:47:22 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Oct 10 18:47:22 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/server/ActiveMQServerLogger.java | 4 ++++
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-2106 log failure to start
broker
Posted by cl...@apache.org.
ARTEMIS-2106 log failure to start broker
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/59ad650a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/59ad650a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/59ad650a
Branch: refs/heads/master
Commit: 59ad650a13c7fd6fdbc60012e09e713ddd24ca81
Parents: c035c55
Author: Justin Bertram <jb...@apache.org>
Authored: Wed Oct 3 11:43:58 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Oct 10 18:47:22 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/server/ActiveMQServerLogger.java | 4 ++++
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/59ad650a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index 7785fe0..65fd22d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -1968,4 +1968,8 @@ public interface ActiveMQServerLogger extends BasicLogger {
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 224096, value = "Error setting up connection from {0} to {1}; protocol {2} not found in map: {3}", format = Message.Format.MESSAGE_FORMAT)
void failedToFindProtocolManager(String remoteAddress, String localAddress, String intendedProtocolManager, String protocolMap);
+
+ @LogMessage(level = Logger.Level.ERROR)
+ @Message(id = 224097, value = "Failed to start server", format = Message.Format.MESSAGE_FORMAT)
+ void failedToStartServer(@Cause Throwable t);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/59ad650a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 64b09d1..6e5406e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -487,6 +487,8 @@ public class ActiveMQServerImpl implements ActiveMQServer {
SERVER_STATE originalState = state;
try {
internalStart();
+ } catch (Throwable t) {
+ ActiveMQServerLogger.LOGGER.failedToStartServer(t);
} finally {
if (originalState == SERVER_STATE.STOPPED) {
networkHealthCheck.setTimeUnit(TimeUnit.MILLISECONDS).setPeriod(configuration.getNetworkCheckPeriod()).