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 2021/07/23 18:29:03 UTC
[activemq-artemis] branch main updated: ARTEMIS-3395 ensure sending
audit log contains message ID
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic 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 bb9bbf0 ARTEMIS-3395 ensure sending audit log contains message ID
bb9bbf0 is described below
commit bb9bbf062da0d6c146a5f40ee4af5e5a6c6997a6
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Wed Jul 21 10:58:47 2021 -0500
ARTEMIS-3395 ensure sending audit log contains message ID
---
.../activemq/artemis/core/server/impl/ServerSessionImpl.java | 8 ++++----
.../activemq/artemis/tests/smoke/logging/AuditLoggerTest.java | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index db9e2cb..7d09366 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -1777,10 +1777,6 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
final boolean direct,
boolean noAutoCreateQueue,
RoutingContext routingContext) throws Exception {
- if (AuditLogger.isMessageEnabled()) {
- AuditLogger.coreSendMessage(getUsername(), messageParameter.toString(), routingContext);
- }
-
final Message message = LargeServerMessageImpl.checkLargeMessage(messageParameter, storageManager);
if (server.hasBrokerMessagePlugins()) {
@@ -1806,6 +1802,10 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
message.setMessageID(id);
}
+ if (AuditLogger.isMessageEnabled()) {
+ AuditLogger.coreSendMessage(getUsername(), message.toString(), routingContext);
+ }
+
SimpleString address = message.getAddressSimpleString();
if (defaultAddress == null && address != null) {
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
index dd77614..4bb95ca 100644
--- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
@@ -207,6 +207,7 @@ public class AuditLoggerTest extends SmokeTestBase {
Wait.waitFor(() -> addressControl.getMessageCount() == 2);
Assert.assertEquals(2, addressControl.getMessageCount());
+ checkAuditLogRecord(false, "messageID=0");
checkAuditLogRecord(true, "sending a message");
checkAuditLogRecord(true, uniqueStr);
checkAuditLogRecord(true, "Hello2");