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 2015/07/06 22:22:11 UTC
[1/3] activemq-artemis git commit: Adding a link to current docs on
alternate indexes
Repository: activemq-artemis
Updated Branches:
refs/heads/master 24979a771 -> f72c18352
Adding a link to current docs on alternate indexes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/351b37e8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/351b37e8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/351b37e8
Branch: refs/heads/master
Commit: 351b37e8385ed82bf60b3f327055ca8a41ec96e2
Parents: 45ac130
Author: Clebert <cl...@apache.org>
Authored: Mon Jul 6 12:56:30 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jul 6 14:35:17 2015 -0400
----------------------------------------------------------------------
.../src/main/resources/hacking-guide/index.html | 10 ++++++++--
artemis-website/src/main/resources/user-manual/index.html | 10 +++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/351b37e8/artemis-website/src/main/resources/hacking-guide/index.html
----------------------------------------------------------------------
diff --git a/artemis-website/src/main/resources/hacking-guide/index.html b/artemis-website/src/main/resources/hacking-guide/index.html
index ef75a15..8f71b63 100644
--- a/artemis-website/src/main/resources/hacking-guide/index.html
+++ b/artemis-website/src/main/resources/hacking-guide/index.html
@@ -16,9 +16,15 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
+<html>
+ <head>
+ <meta http-equiv="refresh" content="3;url=https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/SUMMARY.md"/>
+ </head>
<h1>User Manual</h1>
<p>If you are seeing this message, it is because the Hacking Guide was not built during the Apache ActiveMQ Artemis build. To
build Apache ActiveMQ Artemis with the Hacking Guide you must use the maven release profile:
-<code>mvn clean install -Prelease</code>.</p>
\ No newline at end of file
+<code>mvn clean install -Prelease</code>.</p>
+<p>You can view the current documentation directly on <a href="https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/SUMMARY.md">github</a>.</p>
+
+</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/351b37e8/artemis-website/src/main/resources/user-manual/index.html
----------------------------------------------------------------------
diff --git a/artemis-website/src/main/resources/user-manual/index.html b/artemis-website/src/main/resources/user-manual/index.html
index a36e404..0727109 100644
--- a/artemis-website/src/main/resources/user-manual/index.html
+++ b/artemis-website/src/main/resources/user-manual/index.html
@@ -17,8 +17,16 @@ specific language governing permissions and limitations
under the License.
-->
+<html>
+ <head>
+ <meta http-equiv="refresh" content="3;url=https://github.com/apache/activemq-artemis/blob/master/docs/user-manual/en/SUMMARY.md"/>
+ </head>
+
<h1>User Manual</h1>
<p>If you are seeing this message, it is because the User Manual was not built during the Apache ActiveMQ Artemis build. To
build Apache ActiveMQ Artemis with the User Manual you must use the maven release profile:
-<code>mvn clean install -Prelease</code>.</p>
\ No newline at end of file
+<code>mvn clean install -Prelease</code>.</p>
+<p>You can view the current documentation directly on <a href="https://github.com/apache/activemq-artemis/blob/master/docs/user-manual/en/SUMMARY.md">github</a>.</p>
+
+</html>
[2/3] activemq-artemis git commit: ARTEMIS-153 Improving reconnection
log.debug
Posted by cl...@apache.org.
ARTEMIS-153 Improving reconnection log.debug
https://issues.apache.org/jira/browse/ARTEMIS-153
This is bringing some small changes recent made on the legacy implementation
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/45ac1300
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/45ac1300
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/45ac1300
Branch: refs/heads/master
Commit: 45ac13008f6466235d6347e6430dfacad7650e0d
Parents: 24979a7
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jul 6 12:26:39 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jul 6 14:35:17 2015 -0400
----------------------------------------------------------------------
.../core/client/ActiveMQClientLogger.java | 19 +++++++++++++++++++
.../client/impl/ClientSessionFactoryImpl.java | 2 ++
.../core/client/impl/ClientSessionImpl.java | 6 ------
.../core/impl/ActiveMQSessionContext.java | 6 ++----
4 files changed, 23 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/45ac1300/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index 0679b66..f1ebde2 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -418,4 +418,23 @@ public interface ActiveMQClientLogger extends BasicLogger
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 214025, value = "Invalid type {0}, Using default connection factory at {1}", format = Message.Format.MESSAGE_FORMAT)
void invalidCFType(String type, String uri);
+
+ @LogMessage(level = Logger.Level.TRACE)
+ @Message(id = 214026,
+ value = "Failure captured on connectionID={0}, performing failover or reconnection now",
+ format = Message.Format.MESSAGE_FORMAT)
+ void failoverOrReconnect(Object connectionID, @Cause Throwable cause);
+
+ @LogMessage(level = Logger.Level.DEBUG)
+ @Message(id = 214027,
+ value = "Replaying commands for channelID={0} with lastCommandID from the server={1}",
+ format = Message.Format.MESSAGE_FORMAT)
+ void replayingCommands(Object connectionID, int lastConfirmedCommandID);
+
+ @LogMessage(level = Logger.Level.DEBUG)
+ @Message(id = 214028,
+ value = "Couldn't reattach session {0}, performing as a failover operation now and recreating objects",
+ format = Message.Format.MESSAGE_FORMAT)
+ void reconnectCreatingNewSession(long id);
+
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/45ac1300/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
index 88b0a08..a15f9f1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
@@ -580,6 +580,8 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
*/
private void failoverOrReconnect(final Object connectionID, final ActiveMQException me, String scaleDownTargetNodeID)
{
+ ActiveMQClientLogger.LOGGER.failoverOrReconnect(connectionID, me);
+
Set<ClientSessionInternal> sessionsToClose = null;
if (!clientProtocolManager.isAlive())
return;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/45ac1300/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index 36df058..49d8660 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -975,12 +975,6 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
if (!reattached)
{
-
- if (ActiveMQClientLogger.LOGGER.isDebugEnabled())
- {
- ActiveMQClientLogger.LOGGER.debug("ClientSession couldn't be reattached, creating a new session");
- }
-
for (ClientConsumerInternal consumer : cloneConsumers())
{
consumer.clearAtFailover();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/45ac1300/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index 9763043..23370d5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -594,10 +594,7 @@ public class ActiveMQSessionContext extends SessionContext
if (response.isReattached())
{
- if (ActiveMQClientLogger.LOGGER.isDebugEnabled())
- {
- ActiveMQClientLogger.LOGGER.debug("ClientSession reattached fine, replaying commands");
- }
+ ActiveMQClientLogger.LOGGER.replayingCommands(sessionChannel.getID(), response.getLastConfirmedCommandID());
// The session was found on the server - we reattached transparently ok
sessionChannel.replayCommands(response.getLastConfirmedCommandID());
@@ -606,6 +603,7 @@ public class ActiveMQSessionContext extends SessionContext
}
else
{
+ ActiveMQClientLogger.LOGGER.reconnectCreatingNewSession(sessionChannel.getID());
sessionChannel.clearCommands();
[3/3] activemq-artemis git commit: This closes #60
Posted by cl...@apache.org.
This closes #60
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f72c1835
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f72c1835
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f72c1835
Branch: refs/heads/master
Commit: f72c1835299fe22be0fdf7ce1d3ac92d16d1e64d
Parents: 24979a7 351b37e
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jul 6 16:21:57 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jul 6 16:21:57 2015 -0400
----------------------------------------------------------------------
.../core/client/ActiveMQClientLogger.java | 19 +++++++++++++++++++
.../client/impl/ClientSessionFactoryImpl.java | 2 ++
.../core/client/impl/ClientSessionImpl.java | 6 ------
.../core/impl/ActiveMQSessionContext.java | 6 ++----
.../src/main/resources/hacking-guide/index.html | 10 ++++++++--
.../src/main/resources/user-manual/index.html | 10 +++++++++-
6 files changed, 40 insertions(+), 13 deletions(-)
----------------------------------------------------------------------