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/27 03:27:52 UTC
[activemq-artemis] 01/03: ARTEMIS-3399 fix audit logging for AMQP
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
commit 2954829e3efd9ff66ec2048bd5d52f9656da148e
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Thu Jul 22 12:54:47 2021 -0500
ARTEMIS-3399 fix audit logging for AMQP
Due to the multi-threaded AMQP implementation the ThreadLocal variables
used by the AuditLogger to track the username and remote address don't
work properly. Changes include:
- Passing the audit Subject (set during authentication) and the remote
address explicitly for audit logging on the relevant ServerSession
methods rather than relying on the AuditLogger's ThreadLocal
variables
- Audit logging core session creation *after* successful authentication
so that we have the proper Subject; this is especially important for
the SSL certificate authentication use-case
- Renaming some methods and variables in AuditLogger to more accurately
reflect their intended use
- Adding JavaDoc and refactoring the getCaller methods on AuditLogger
- Refactor audit log testing and add a new test
---
.../apache/activemq/artemis/logs/AuditLogger.java | 693 +++++++++++----------
.../core/management/impl/AbstractControl.java | 2 +-
.../core/management/impl/AcceptorControlImpl.java | 14 +-
.../management/impl/ActiveMQServerControlImpl.java | 306 ++++-----
.../core/management/impl/AddressControlImpl.java | 50 +-
.../impl/BaseBroadcastGroupControlImpl.java | 14 +-
.../core/management/impl/BridgeControlImpl.java | 40 +-
.../management/impl/BroadcastGroupControlImpl.java | 6 +-
.../impl/ClusterConnectionControlImpl.java | 38 +-
.../core/management/impl/DivertControlImpl.java | 22 +-
.../JGroupsChannelBroadcastGroupControlImpl.java | 2 +-
.../impl/JGroupsFileBroadcastGroupControlImpl.java | 6 +-
...JGroupsPropertiesBroadcastGroupControlImpl.java | 2 +-
.../core/management/impl/QueueControlImpl.java | 190 +++---
.../core/security/impl/SecurityStoreImpl.java | 4 +-
.../core/server/impl/ActiveMQServerImpl.java | 10 +-
.../core/server/impl/ServerConsumerImpl.java | 4 +-
.../core/server/impl/ServerSessionImpl.java | 32 +-
.../core/server/management/BasicAuthenticator.java | 4 +-
.../core/server/management/JaasAuthenticator.java | 4 +-
.../artemis/component/AuthenticationFilter.java | 4 +-
tests/smoke-tests/pom.xml | 21 +
.../audit-logging-amqp-mutual-ssl/broker.xml | 51 ++
.../cert-roles.properties | 19 +
.../cert-users.properties | 18 +
.../client-side-keystore.jks | Bin 0 -> 2252 bytes
.../client-side-truststore.jks | Bin 0 -> 963 bytes
.../logging.properties | 80 +++
.../audit-logging-amqp-mutual-ssl/login.config | 30 +
.../server-side-keystore.jks | Bin 0 -> 2254 bytes
.../server-side-truststore.jks | Bin 0 -> 963 bytes
.../artemis/tests/smoke/common/SmokeTestBase.java | 9 +-
.../logging/AuditLoggerAMQPMutualSSLTest.java | 89 +++
.../smoke/logging/AuditLoggerResourceTest.java | 100 +--
.../tests/smoke/logging/AuditLoggerTest.java | 129 +---
.../tests/smoke/logging/AuditLoggerTestBase.java | 107 ++++
36 files changed, 1175 insertions(+), 925 deletions(-)
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
index cd2fd49..9a41027 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
@@ -47,53 +47,50 @@ import java.util.Set;
@MessageLogger(projectCode = "AMQ")
public interface AuditLogger extends BasicLogger {
- AuditLogger LOGGER = Logger.getMessageLogger(AuditLogger.class, "org.apache.activemq.audit.base");
+ AuditLogger BASE_LOGGER = Logger.getMessageLogger(AuditLogger.class, "org.apache.activemq.audit.base");
AuditLogger RESOURCE_LOGGER = Logger.getMessageLogger(AuditLogger.class, "org.apache.activemq.audit.resource");
AuditLogger MESSAGE_LOGGER = Logger.getMessageLogger(AuditLogger.class, "org.apache.activemq.audit.message");
- ThreadLocal<String> remoteUrl = new ThreadLocal<>();
+ ThreadLocal<String> remoteAddress = new ThreadLocal<>();
ThreadLocal<Subject> currentCaller = new ThreadLocal<>();
static boolean isAnyLoggingEnabled() {
- return isEnabled() || isMessageEnabled() || isResourceLoggingEnabled();
+ return isBaseLoggingEnabled() || isMessageLoggingEnabled() || isResourceLoggingEnabled();
}
- static boolean isEnabled() {
- return LOGGER.isEnabled(Logger.Level.INFO);
+ static boolean isBaseLoggingEnabled() {
+ return BASE_LOGGER.isEnabled(Logger.Level.INFO);
}
static boolean isResourceLoggingEnabled() {
return RESOURCE_LOGGER.isEnabled(Logger.Level.INFO);
}
- static boolean isMessageEnabled() {
+ static boolean isMessageLoggingEnabled() {
return MESSAGE_LOGGER.isEnabled(Logger.Level.INFO);
}
+ /**
+ * @return a String representing the "caller" in the format "user(role)@remoteAddress" using ThreadLocal values (if set)
+ */
static String getCaller() {
Subject subject = Subject.getSubject(AccessController.getContext());
if (subject == null) {
subject = currentCaller.get();
}
- return getCaller(subject);
+ return getCaller(subject, null);
}
- static String getCaller(String user) {
- Subject subject = Subject.getSubject(AccessController.getContext());
- if (subject == null) {
- subject = currentCaller.get();
- }
- if (subject == null) {
- return user + (remoteUrl.get() == null ? "@unknown" : remoteUrl.get());
- }
- return getCaller(subject);
- }
-
- static String getCaller(Subject subject) {
+ /**
+ * @param subject the Subject to be used instead of the corresponding ThreadLocal Subject
+ * @param remoteAddress the remote address to use; if null use the corresponding ThreadLocal remote address (if set)
+ * @return a String representing the "caller" in the format "user(role)@remoteAddress"
+ */
+ static String getCaller(Subject subject, String remoteAddress) {
String user = "anonymous";
String roles = "";
- String url = remoteUrl.get() == null ? "@unknown" : remoteUrl.get();
+ String url = remoteAddress == null ? (AuditLogger.remoteAddress.get() == null ? "@unknown" : AuditLogger.remoteAddress.get()) : formatRemoteAddress(remoteAddress);
if (subject != null) {
Set<Principal> principals = subject.getPrincipals();
for (Principal principal : principals) {
@@ -112,17 +109,21 @@ public interface AuditLogger extends BasicLogger {
}
static void setRemoteAddress(String remoteAddress) {
+ AuditLogger.remoteAddress.set(formatRemoteAddress(remoteAddress));
+ }
+
+ static String formatRemoteAddress(String remoteAddress) {
String actualAddress;
if (remoteAddress.startsWith("/")) {
actualAddress = "@" + remoteAddress.substring(1);
} else {
actualAddress = "@" + remoteAddress;
}
- remoteUrl.set(actualAddress);
+ return actualAddress;
}
static String getRemoteAddress() {
- return remoteUrl.get();
+ return remoteAddress.get();
}
static String arrayToString(Object value) {
@@ -154,7 +155,7 @@ public interface AuditLogger extends BasicLogger {
}
static void getRoutingTypes(Object source) {
- LOGGER.getRoutingTypes(getCaller(), source);
+ BASE_LOGGER.getRoutingTypes(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -162,7 +163,7 @@ public interface AuditLogger extends BasicLogger {
void getRoutingTypes(String user, Object source, Object... args);
static void getRoutingTypesAsJSON(Object source) {
- LOGGER.getRoutingTypesAsJSON(getCaller(), source);
+ BASE_LOGGER.getRoutingTypesAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -170,7 +171,7 @@ public interface AuditLogger extends BasicLogger {
void getRoutingTypesAsJSON(String user, Object source, Object... args);
static void getQueueNames(Object source, Object... args) {
- LOGGER.getQueueNames(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getQueueNames(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -178,7 +179,7 @@ public interface AuditLogger extends BasicLogger {
void getQueueNames(String user, Object source, Object... args);
static void getBindingNames(Object source) {
- LOGGER.getBindingNames(getCaller(), source);
+ BASE_LOGGER.getBindingNames(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -186,7 +187,7 @@ public interface AuditLogger extends BasicLogger {
void getBindingNames(String user, Object source, Object... args);
static void getRoles(Object source, Object... args) {
- LOGGER.getRoles(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getRoles(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -194,7 +195,7 @@ public interface AuditLogger extends BasicLogger {
void getRoles(String user, Object source, Object... args);
static void getRolesAsJSON(Object source, Object... args) {
- LOGGER.getRolesAsJSON(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getRolesAsJSON(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -202,7 +203,7 @@ public interface AuditLogger extends BasicLogger {
void getRolesAsJSON(String user, Object source, Object... args);
static void getNumberOfBytesPerPage(Object source) {
- LOGGER.getNumberOfBytesPerPage(getCaller(), source);
+ BASE_LOGGER.getNumberOfBytesPerPage(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -210,7 +211,7 @@ public interface AuditLogger extends BasicLogger {
void getNumberOfBytesPerPage(String user, Object source, Object... args);
static void getAddressSize(Object source) {
- LOGGER.getAddressSize(getCaller(), source);
+ BASE_LOGGER.getAddressSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -218,7 +219,7 @@ public interface AuditLogger extends BasicLogger {
void getAddressSize(String user, Object source, Object... args);
static void getNumberOfMessages(Object source) {
- LOGGER.getNumberOfMessages(getCaller(), source);
+ BASE_LOGGER.getNumberOfMessages(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -226,7 +227,7 @@ public interface AuditLogger extends BasicLogger {
void getNumberOfMessages(String user, Object source, Object... args);
static void isPaging(Object source) {
- LOGGER.isPaging(getCaller(), source);
+ BASE_LOGGER.isPaging(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -234,7 +235,7 @@ public interface AuditLogger extends BasicLogger {
void isPaging(String user, Object source, Object... args);
static void getNumberOfPages(Object source) {
- LOGGER.getNumberOfPages(getCaller(), source);
+ BASE_LOGGER.getNumberOfPages(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -242,7 +243,7 @@ public interface AuditLogger extends BasicLogger {
void getNumberOfPages(String user, Object source, Object... args);
static void getRoutedMessageCount(Object source) {
- LOGGER.getRoutedMessageCount(getCaller(), source);
+ BASE_LOGGER.getRoutedMessageCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -250,23 +251,23 @@ public interface AuditLogger extends BasicLogger {
void getRoutedMessageCount(String user, Object source, Object... args);
static void getUnRoutedMessageCount(Object source) {
- LOGGER.getUnRoutedMessageCount(getCaller(), source);
+ BASE_LOGGER.getUnRoutedMessageCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601012, value = "User {0} is getting unrouted message count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
void getUnRoutedMessageCount(String user, Object source, Object... args);
- static void sendMessage(Object source, String user, Object... args) {
- LOGGER.sendMessage(getCaller(user), source, arrayToString(args));
+ static void sendMessageThroughManagement(Object source, Object... args) {
+ BASE_LOGGER.sendMessageThroughManagement(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601013, value = "User {0} is sending a message on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void sendMessage(String user, Object source, Object... args);
+ void sendMessageThroughManagement(String user, Object source, Object... args);
static void getName(Object source) {
- LOGGER.getName(getCaller(), source);
+ BASE_LOGGER.getName(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -274,7 +275,7 @@ public interface AuditLogger extends BasicLogger {
void getName(String user, Object source, Object... args);
static void getAddress(Object source) {
- LOGGER.getAddress(getCaller(), source);
+ BASE_LOGGER.getAddress(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -282,7 +283,7 @@ public interface AuditLogger extends BasicLogger {
void getAddress(String user, Object source, Object... args);
static void getFilter(Object source) {
- LOGGER.getFilter(getCaller(), source);
+ BASE_LOGGER.getFilter(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -290,7 +291,7 @@ public interface AuditLogger extends BasicLogger {
void getFilter(String user, Object source, Object... args);
static void isDurable(Object source) {
- LOGGER.isDurable(getCaller(), source);
+ BASE_LOGGER.isDurable(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -298,7 +299,7 @@ public interface AuditLogger extends BasicLogger {
void isDurable(String user, Object source, Object... args);
static void getMessageCount(Object source) {
- LOGGER.getMessageCount(getCaller(), source);
+ BASE_LOGGER.getMessageCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -306,7 +307,7 @@ public interface AuditLogger extends BasicLogger {
void getMessageCount(String user, Object source, Object... args);
static void getMBeanInfo(Object source) {
- LOGGER.getMBeanInfo(getCaller(), source);
+ BASE_LOGGER.getMBeanInfo(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -314,7 +315,7 @@ public interface AuditLogger extends BasicLogger {
void getMBeanInfo(String user, Object source, Object... args);
static void getFactoryClassName(Object source) {
- LOGGER.getFactoryClassName(getCaller(), source);
+ BASE_LOGGER.getFactoryClassName(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -322,7 +323,7 @@ public interface AuditLogger extends BasicLogger {
void getFactoryClassName(String user, Object source, Object... args);
static void getParameters(Object source) {
- LOGGER.getParameters(getCaller(), source);
+ BASE_LOGGER.getParameters(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -330,7 +331,7 @@ public interface AuditLogger extends BasicLogger {
void getParameters(String user, Object source, Object... args);
static void reload(Object source) {
- LOGGER.reload(getCaller(), source);
+ BASE_LOGGER.reload(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -338,7 +339,7 @@ public interface AuditLogger extends BasicLogger {
void reload(String user, Object source, Object... args);
static void isStarted(Object source) {
- LOGGER.isStarted(getCaller(), source);
+ BASE_LOGGER.isStarted(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -346,7 +347,7 @@ public interface AuditLogger extends BasicLogger {
void isStarted(String user, Object source, Object... args);
static void startAcceptor(Object source) {
- LOGGER.startAcceptor(getCaller(), source);
+ BASE_LOGGER.startAcceptor(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -354,7 +355,7 @@ public interface AuditLogger extends BasicLogger {
void startAcceptor(String user, Object source, Object... args);
static void stopAcceptor(Object source) {
- LOGGER.stopAcceptor(getCaller(), source);
+ BASE_LOGGER.stopAcceptor(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -362,7 +363,7 @@ public interface AuditLogger extends BasicLogger {
void stopAcceptor(String user, Object source, Object... args);
static void getVersion(Object source) {
- LOGGER.getVersion(getCaller(), source);
+ BASE_LOGGER.getVersion(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -370,7 +371,7 @@ public interface AuditLogger extends BasicLogger {
void getVersion(String user, Object source, Object... args);
static void isBackup(Object source) {
- LOGGER.isBackup(getCaller(), source);
+ BASE_LOGGER.isBackup(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -378,7 +379,7 @@ public interface AuditLogger extends BasicLogger {
void isBackup(String user, Object source, Object... args);
static void isSharedStore(Object source) {
- LOGGER.isSharedStore(getCaller(), source);
+ BASE_LOGGER.isSharedStore(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -386,7 +387,7 @@ public interface AuditLogger extends BasicLogger {
void isSharedStore(String user, Object source, Object... args);
static void getBindingsDirectory(Object source) {
- LOGGER.getBindingsDirectory(getCaller(), source);
+ BASE_LOGGER.getBindingsDirectory(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -394,7 +395,7 @@ public interface AuditLogger extends BasicLogger {
void getBindingsDirectory(String user, Object source, Object... args);
static void getIncomingInterceptorClassNames(Object source) {
- LOGGER.getIncomingInterceptorClassNames(getCaller(), source);
+ BASE_LOGGER.getIncomingInterceptorClassNames(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -402,7 +403,7 @@ public interface AuditLogger extends BasicLogger {
void getIncomingInterceptorClassNames(String user, Object source, Object... args);
static void getOutgoingInterceptorClassNames(Object source) {
- LOGGER.getOutgoingInterceptorClassNames(getCaller(), source);
+ BASE_LOGGER.getOutgoingInterceptorClassNames(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -410,7 +411,7 @@ public interface AuditLogger extends BasicLogger {
void getOutgoingInterceptorClassNames(String user, Object source, Object... args);
static void getJournalBufferSize(Object source) {
- LOGGER.getJournalBufferSize(getCaller(), source);
+ BASE_LOGGER.getJournalBufferSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -418,7 +419,7 @@ public interface AuditLogger extends BasicLogger {
void getJournalBufferSize(String user, Object source, Object... args);
static void getJournalBufferTimeout(Object source) {
- LOGGER.getJournalBufferTimeout(getCaller(), source);
+ BASE_LOGGER.getJournalBufferTimeout(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -426,7 +427,7 @@ public interface AuditLogger extends BasicLogger {
void getJournalBufferTimeout(String user, Object source, Object... args);
static void setFailoverOnServerShutdown(Object source, Object... args) {
- LOGGER.setFailoverOnServerShutdown(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.setFailoverOnServerShutdown(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -434,7 +435,7 @@ public interface AuditLogger extends BasicLogger {
void setFailoverOnServerShutdown(String user, Object source, Object... args);
static void isFailoverOnServerShutdown(Object source) {
- LOGGER.isFailoverOnServerShutdown(getCaller(), source);
+ BASE_LOGGER.isFailoverOnServerShutdown(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -442,7 +443,7 @@ public interface AuditLogger extends BasicLogger {
void isFailoverOnServerShutdown(String user, Object source, Object... args);
static void getJournalMaxIO(Object source) {
- LOGGER.getJournalMaxIO(getCaller(), source);
+ BASE_LOGGER.getJournalMaxIO(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -450,7 +451,7 @@ public interface AuditLogger extends BasicLogger {
void getJournalMaxIO(String user, Object source, Object... args);
static void getJournalDirectory(Object source) {
- LOGGER.getJournalDirectory(getCaller(), source);
+ BASE_LOGGER.getJournalDirectory(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -458,7 +459,7 @@ public interface AuditLogger extends BasicLogger {
void getJournalDirectory(String user, Object source, Object... args);
static void getJournalFileSize(Object source) {
- LOGGER.getJournalFileSize(getCaller(), source);
+ BASE_LOGGER.getJournalFileSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -466,7 +467,7 @@ public interface AuditLogger extends BasicLogger {
void getJournalFileSize(String user, Object source, Object... args);
static void getJournalMinFiles(Object source) {
- LOGGER.getJournalMinFiles(getCaller(), source);
+ BASE_LOGGER.getJournalMinFiles(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -474,7 +475,7 @@ public interface AuditLogger extends BasicLogger {
void getJournalMinFiles(String user, Object source, Object... args);
static void getJournalCompactMinFiles(Object source) {
- LOGGER.getJournalCompactMinFiles(getCaller(), source);
+ BASE_LOGGER.getJournalCompactMinFiles(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -482,7 +483,7 @@ public interface AuditLogger extends BasicLogger {
void getJournalCompactMinFiles(String user, Object source, Object... args);
static void getJournalCompactPercentage(Object source) {
- LOGGER.getJournalCompactPercentage(getCaller(), source);
+ BASE_LOGGER.getJournalCompactPercentage(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -490,7 +491,7 @@ public interface AuditLogger extends BasicLogger {
void getJournalCompactPercentage(String user, Object source, Object... args);
static void isPersistenceEnabled(Object source) {
- LOGGER.isPersistenceEnabled(getCaller(), source);
+ BASE_LOGGER.isPersistenceEnabled(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -498,7 +499,7 @@ public interface AuditLogger extends BasicLogger {
void isPersistenceEnabled(String user, Object source, Object... args);
static void getJournalType(Object source) {
- LOGGER.getJournalType(getCaller(), source);
+ BASE_LOGGER.getJournalType(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -506,7 +507,7 @@ public interface AuditLogger extends BasicLogger {
void getJournalType(String user, Object source, Object... args);
static void getPagingDirectory(Object source) {
- LOGGER.getPagingDirectory(getCaller(), source);
+ BASE_LOGGER.getPagingDirectory(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -514,7 +515,7 @@ public interface AuditLogger extends BasicLogger {
void getPagingDirectory(String user, Object source, Object... args);
static void getScheduledThreadPoolMaxSize(Object source) {
- LOGGER.getScheduledThreadPoolMaxSize(getCaller(), source);
+ BASE_LOGGER.getScheduledThreadPoolMaxSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -522,7 +523,7 @@ public interface AuditLogger extends BasicLogger {
void getScheduledThreadPoolMaxSize(String user, Object source, Object... args);
static void getThreadPoolMaxSize(Object source) {
- LOGGER.getThreadPoolMaxSize(getCaller(), source);
+ BASE_LOGGER.getThreadPoolMaxSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -530,7 +531,7 @@ public interface AuditLogger extends BasicLogger {
void getThreadPoolMaxSize(String user, Object source, Object... args);
static void getSecurityInvalidationInterval(Object source) {
- LOGGER.getSecurityInvalidationInterval(getCaller(), source);
+ BASE_LOGGER.getSecurityInvalidationInterval(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -538,7 +539,7 @@ public interface AuditLogger extends BasicLogger {
void getSecurityInvalidationInterval(String user, Object source, Object... args);
static void isClustered(Object source) {
- LOGGER.isClustered(getCaller(), source);
+ BASE_LOGGER.isClustered(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -546,7 +547,7 @@ public interface AuditLogger extends BasicLogger {
void isClustered(String user, Object source, Object... args);
static void isCreateBindingsDir(Object source) {
- LOGGER.isCreateBindingsDir(getCaller(), source);
+ BASE_LOGGER.isCreateBindingsDir(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -554,7 +555,7 @@ public interface AuditLogger extends BasicLogger {
void isCreateBindingsDir(String user, Object source, Object... args);
static void isCreateJournalDir(Object source) {
- LOGGER.isCreateJournalDir(getCaller(), source);
+ BASE_LOGGER.isCreateJournalDir(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -562,7 +563,7 @@ public interface AuditLogger extends BasicLogger {
void isCreateJournalDir(String user, Object source, Object... args);
static void isJournalSyncNonTransactional(Object source) {
- LOGGER.isJournalSyncNonTransactional(getCaller(), source);
+ BASE_LOGGER.isJournalSyncNonTransactional(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -570,7 +571,7 @@ public interface AuditLogger extends BasicLogger {
void isJournalSyncNonTransactional(String user, Object source, Object... args);
static void isJournalSyncTransactional(Object source) {
- LOGGER.isJournalSyncTransactional(getCaller(), source);
+ BASE_LOGGER.isJournalSyncTransactional(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -578,7 +579,7 @@ public interface AuditLogger extends BasicLogger {
void isJournalSyncTransactional(String user, Object source, Object... args);
static void isSecurityEnabled(Object source) {
- LOGGER.isSecurityEnabled(getCaller(), source);
+ BASE_LOGGER.isSecurityEnabled(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -586,7 +587,7 @@ public interface AuditLogger extends BasicLogger {
void isSecurityEnabled(String user, Object source, Object... args);
static void isAsyncConnectionExecutionEnabled(Object source) {
- LOGGER.isAsyncConnectionExecutionEnabled(getCaller(), source);
+ BASE_LOGGER.isAsyncConnectionExecutionEnabled(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -594,7 +595,7 @@ public interface AuditLogger extends BasicLogger {
void isAsyncConnectionExecutionEnabled(String user, Object source, Object... args);
static void getDiskScanPeriod(Object source) {
- LOGGER.getDiskScanPeriod(getCaller(), source);
+ BASE_LOGGER.getDiskScanPeriod(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -602,7 +603,7 @@ public interface AuditLogger extends BasicLogger {
void getDiskScanPeriod(String user, Object source, Object... args);
static void getMaxDiskUsage(Object source) {
- LOGGER.getMaxDiskUsage(getCaller(), source);
+ BASE_LOGGER.getMaxDiskUsage(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -610,7 +611,7 @@ public interface AuditLogger extends BasicLogger {
void getMaxDiskUsage(String user, Object source, Object... args);
static void getGlobalMaxSize(Object source) {
- LOGGER.getGlobalMaxSize(getCaller(), source);
+ BASE_LOGGER.getGlobalMaxSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -618,7 +619,7 @@ public interface AuditLogger extends BasicLogger {
void getGlobalMaxSize(String user, Object source, Object... args);
static void getAddressMemoryUsage(Object source) {
- LOGGER.getAddressMemoryUsage(getCaller(), source);
+ BASE_LOGGER.getAddressMemoryUsage(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -626,7 +627,7 @@ public interface AuditLogger extends BasicLogger {
void getAddressMemoryUsage(String user, Object source, Object... args);
static void getAddressMemoryUsagePercentage(Object source) {
- LOGGER.getAddressMemoryUsagePercentage(getCaller(), source);
+ BASE_LOGGER.getAddressMemoryUsagePercentage(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -634,7 +635,7 @@ public interface AuditLogger extends BasicLogger {
void getAddressMemoryUsagePercentage(String user, Object source, Object... args);
static void freezeReplication(Object source) {
- LOGGER.freezeReplication(getCaller(), source);
+ BASE_LOGGER.freezeReplication(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -642,7 +643,7 @@ public interface AuditLogger extends BasicLogger {
void freezeReplication(String user, Object source, Object... args);
static void createAddress(Object source, Object... args) {
- LOGGER.createAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.createAddress(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -650,7 +651,7 @@ public interface AuditLogger extends BasicLogger {
void createAddress(String user, Object source, Object... args);
static void updateAddress(Object source, Object... args) {
- LOGGER.updateAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.updateAddress(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -658,7 +659,7 @@ public interface AuditLogger extends BasicLogger {
void updateAddress(String user, Object source, Object... args);
static void deleteAddress(Object source, Object... args) {
- LOGGER.deleteAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.deleteAddress(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -666,15 +667,15 @@ public interface AuditLogger extends BasicLogger {
void deleteAddress(String user, Object source, Object... args);
static void deployQueue(Object source, Object... args) {
- LOGGER.deployQueue(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.deployQueue(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601064, value = "User {0} is creating a queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
void deployQueue(String user, Object source, Object... args);
- static void createQueue(Object source, String user, Object... args) {
- RESOURCE_LOGGER.createQueue(getCaller(user), source, arrayToString(args));
+ static void createQueue(Object source, Subject user, String remoteAddress, Object... args) {
+ RESOURCE_LOGGER.createQueue(getCaller(user, remoteAddress), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -682,7 +683,7 @@ public interface AuditLogger extends BasicLogger {
void createQueue(String user, Object source, Object... args);
static void updateQueue(Object source, Object... args) {
- LOGGER.updateQueue(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.updateQueue(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -690,7 +691,7 @@ public interface AuditLogger extends BasicLogger {
void updateQueue(String user, Object source, Object... args);
static void getClusterConnectionNames(Object source) {
- LOGGER.getClusterConnectionNames(getCaller(), source);
+ BASE_LOGGER.getClusterConnectionNames(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -698,7 +699,7 @@ public interface AuditLogger extends BasicLogger {
void getClusterConnectionNames(String user, Object source, Object... args);
static void getUptime(Object source) {
- LOGGER.getUptime(getCaller(), source);
+ BASE_LOGGER.getUptime(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -706,7 +707,7 @@ public interface AuditLogger extends BasicLogger {
void getUptime(String user, Object source, Object... args);
static void getUptimeMillis(Object source) {
- LOGGER.getUptimeMillis(getCaller(), source);
+ BASE_LOGGER.getUptimeMillis(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -714,7 +715,7 @@ public interface AuditLogger extends BasicLogger {
void getUptimeMillis(String user, Object source, Object... args);
static void isReplicaSync(Object source) {
- LOGGER.isReplicaSync(getCaller(), source);
+ BASE_LOGGER.isReplicaSync(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -722,15 +723,15 @@ public interface AuditLogger extends BasicLogger {
void isReplicaSync(String user, Object source, Object... args);
static void getAddressNames(Object source) {
- LOGGER.getAddressNames(getCaller(), source);
+ BASE_LOGGER.getAddressNames(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601071, value = "User {0} is getting address names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
void getAddressNames(String user, Object source, Object... args);
- static void destroyQueue(Object source, String user, Object... args) {
- LOGGER.destroyQueue(getCaller(user), source, arrayToString(args));
+ static void destroyQueue(Object source, Subject user, String remoteAddress, Object... args) {
+ BASE_LOGGER.destroyQueue(getCaller(user, remoteAddress), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -738,7 +739,7 @@ public interface AuditLogger extends BasicLogger {
void destroyQueue(String user, Object source, Object... args);
static void getAddressInfo(Object source, Object... args) {
- LOGGER.getAddressInfo(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getAddressInfo(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -746,7 +747,7 @@ public interface AuditLogger extends BasicLogger {
void getAddressInfo(String user, Object source, Object... args);
static void listBindingsForAddress(Object source, Object... args) {
- LOGGER.listBindingsForAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listBindingsForAddress(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -754,7 +755,7 @@ public interface AuditLogger extends BasicLogger {
void listBindingsForAddress(String user, Object source, Object... args);
static void listAddresses(Object source, Object... args) {
- LOGGER.listAddresses(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listAddresses(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -762,7 +763,7 @@ public interface AuditLogger extends BasicLogger {
void listAddresses(String user, Object source, Object... args);
static void getConnectionCount(Object source, Object... args) {
- LOGGER.getConnectionCount(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getConnectionCount(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -770,7 +771,7 @@ public interface AuditLogger extends BasicLogger {
void getConnectionCount(String user, Object source, Object... args);
static void getTotalConnectionCount(Object source) {
- LOGGER.getTotalConnectionCount(getCaller(), source);
+ BASE_LOGGER.getTotalConnectionCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -778,7 +779,7 @@ public interface AuditLogger extends BasicLogger {
void getTotalConnectionCount(String user, Object source, Object... args);
static void getTotalMessageCount(Object source) {
- LOGGER.getTotalMessageCount(getCaller(), source);
+ BASE_LOGGER.getTotalMessageCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -786,7 +787,7 @@ public interface AuditLogger extends BasicLogger {
void getTotalMessageCount(String user, Object source, Object... args);
static void getTotalMessagesAdded(Object source) {
- LOGGER.getTotalMessagesAdded(getCaller(), source);
+ BASE_LOGGER.getTotalMessagesAdded(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -794,7 +795,7 @@ public interface AuditLogger extends BasicLogger {
void getTotalMessagesAdded(String user, Object source, Object... args);
static void getTotalMessagesAcknowledged(Object source) {
- LOGGER.getTotalMessagesAcknowledged(getCaller(), source);
+ BASE_LOGGER.getTotalMessagesAcknowledged(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -802,7 +803,7 @@ public interface AuditLogger extends BasicLogger {
void getTotalMessagesAcknowledged(String user, Object source, Object... args);
static void getTotalConsumerCount(Object source) {
- LOGGER.getTotalConsumerCount(getCaller(), source);
+ BASE_LOGGER.getTotalConsumerCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -810,7 +811,7 @@ public interface AuditLogger extends BasicLogger {
void getTotalConsumerCount(String user, Object source, Object... args);
static void enableMessageCounters(Object source) {
- LOGGER.enableMessageCounters(getCaller(), source);
+ BASE_LOGGER.enableMessageCounters(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -818,7 +819,7 @@ public interface AuditLogger extends BasicLogger {
void enableMessageCounters(String user, Object source, Object... args);
static void disableMessageCounters(Object source) {
- LOGGER.disableMessageCounters(getCaller(), source);
+ BASE_LOGGER.disableMessageCounters(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -826,7 +827,7 @@ public interface AuditLogger extends BasicLogger {
void disableMessageCounters(String user, Object source, Object... args);
static void resetAllMessageCounters(Object source) {
- LOGGER.resetAllMessageCounters(getCaller(), source);
+ BASE_LOGGER.resetAllMessageCounters(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -834,7 +835,7 @@ public interface AuditLogger extends BasicLogger {
void resetAllMessageCounters(String user, Object source, Object... args);
static void resetAllMessageCounterHistories(Object source) {
- LOGGER.resetAllMessageCounterHistories(getCaller(), source);
+ BASE_LOGGER.resetAllMessageCounterHistories(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -842,7 +843,7 @@ public interface AuditLogger extends BasicLogger {
void resetAllMessageCounterHistories(String user, Object source, Object... args);
static void isMessageCounterEnabled(Object source) {
- LOGGER.isMessageCounterEnabled(getCaller(), source);
+ BASE_LOGGER.isMessageCounterEnabled(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -850,7 +851,7 @@ public interface AuditLogger extends BasicLogger {
void isMessageCounterEnabled(String user, Object source, Object... args);
static void getMessageCounterSamplePeriod(Object source) {
- LOGGER.getMessageCounterSamplePeriod(getCaller(), source);
+ BASE_LOGGER.getMessageCounterSamplePeriod(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -858,7 +859,7 @@ public interface AuditLogger extends BasicLogger {
void getMessageCounterSamplePeriod(String user, Object source, Object... args);
static void setMessageCounterSamplePeriod(Object source, Object... args) {
- LOGGER.setMessageCounterSamplePeriod(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.setMessageCounterSamplePeriod(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -866,7 +867,7 @@ public interface AuditLogger extends BasicLogger {
void setMessageCounterSamplePeriod(String user, Object source, Object... args);
static void getMessageCounterMaxDayCount(Object source) {
- LOGGER.getMessageCounterMaxDayCount(getCaller(), source);
+ BASE_LOGGER.getMessageCounterMaxDayCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -874,7 +875,7 @@ public interface AuditLogger extends BasicLogger {
void getMessageCounterMaxDayCount(String user, Object source, Object... args);
static void setMessageCounterMaxDayCount(Object source, Object... args) {
- LOGGER.setMessageCounterMaxDayCount(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.setMessageCounterMaxDayCount(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -882,7 +883,7 @@ public interface AuditLogger extends BasicLogger {
void setMessageCounterMaxDayCount(String user, Object source, Object... args);
static void listPreparedTransactions(Object source) {
- LOGGER.listPreparedTransactions(getCaller(), source);
+ BASE_LOGGER.listPreparedTransactions(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -890,7 +891,7 @@ public interface AuditLogger extends BasicLogger {
void listPreparedTransactions(String user, Object source, Object... args);
static void listPreparedTransactionDetailsAsJSON(Object source) {
- LOGGER.listPreparedTransactionDetailsAsJSON(getCaller(), source);
+ BASE_LOGGER.listPreparedTransactionDetailsAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -898,7 +899,7 @@ public interface AuditLogger extends BasicLogger {
void listPreparedTransactionDetailsAsJSON(String user, Object source, Object... args);
static void listPreparedTransactionDetailsAsHTML(Object source, Object... args) {
- LOGGER.listPreparedTransactionDetailsAsHTML(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listPreparedTransactionDetailsAsHTML(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -906,7 +907,7 @@ public interface AuditLogger extends BasicLogger {
void listPreparedTransactionDetailsAsHTML(String user, Object source, Object... args);
static void listHeuristicCommittedTransactions(Object source) {
- LOGGER.listHeuristicCommittedTransactions(getCaller(), source);
+ BASE_LOGGER.listHeuristicCommittedTransactions(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -914,7 +915,7 @@ public interface AuditLogger extends BasicLogger {
void listHeuristicCommittedTransactions(String user, Object source, Object... args);
static void listHeuristicRolledBackTransactions(Object source) {
- LOGGER.listHeuristicRolledBackTransactions(getCaller(), source);
+ BASE_LOGGER.listHeuristicRolledBackTransactions(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -922,7 +923,7 @@ public interface AuditLogger extends BasicLogger {
void listHeuristicRolledBackTransactions(String user, Object source, Object... args);
static void commitPreparedTransaction(Object source, Object... args) {
- LOGGER.commitPreparedTransaction(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.commitPreparedTransaction(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -930,7 +931,7 @@ public interface AuditLogger extends BasicLogger {
void commitPreparedTransaction(String user, Object source, Object... args);
static void rollbackPreparedTransaction(Object source, Object... args) {
- LOGGER.rollbackPreparedTransaction(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.rollbackPreparedTransaction(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -938,7 +939,7 @@ public interface AuditLogger extends BasicLogger {
void rollbackPreparedTransaction(String user, Object source, Object... args);
static void listRemoteAddresses(Object source, Object... args) {
- LOGGER.listRemoteAddresses(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listRemoteAddresses(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -946,7 +947,7 @@ public interface AuditLogger extends BasicLogger {
void listRemoteAddresses(String user, Object source, Object... args);
static void closeConnectionsForAddress(Object source, Object... args) {
- LOGGER.closeConnectionsForAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeConnectionsForAddress(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -954,7 +955,7 @@ public interface AuditLogger extends BasicLogger {
void closeConnectionsForAddress(String user, Object source, Object... args);
static void closeConsumerConnectionsForAddress(Object source, Object... args) {
- LOGGER.closeConsumerConnectionsForAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeConsumerConnectionsForAddress(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -962,7 +963,7 @@ public interface AuditLogger extends BasicLogger {
void closeConsumerConnectionsForAddress(String user, Object source, Object... args);
static void closeConnectionsForUser(Object source, Object... args) {
- LOGGER.closeConnectionsForUser(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeConnectionsForUser(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -970,7 +971,7 @@ public interface AuditLogger extends BasicLogger {
void closeConnectionsForUser(String user, Object source, Object... args);
static void closeConnectionWithID(Object source, Object... args) {
- LOGGER.closeConnectionWithID(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeConnectionWithID(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -978,7 +979,7 @@ public interface AuditLogger extends BasicLogger {
void closeConnectionWithID(String user, Object source, Object... args);
static void closeSessionWithID(Object source, Object... args) {
- LOGGER.closeSessionWithID(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeSessionWithID(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -986,7 +987,7 @@ public interface AuditLogger extends BasicLogger {
void closeSessionWithID(String user, Object source, Object... args);
static void closeConsumerWithID(Object source, Object... args) {
- LOGGER.closeConsumerWithID(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeConsumerWithID(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -994,7 +995,7 @@ public interface AuditLogger extends BasicLogger {
void closeConsumerWithID(String user, Object source, Object... args);
static void listConnectionIDs(Object source) {
- LOGGER.listConnectionIDs(getCaller(), source);
+ BASE_LOGGER.listConnectionIDs(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1002,7 +1003,7 @@ public interface AuditLogger extends BasicLogger {
void listConnectionIDs(String user, Object source, Object... args);
static void listSessions(Object source, Object... args) {
- LOGGER.listSessions(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listSessions(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1010,7 +1011,7 @@ public interface AuditLogger extends BasicLogger {
void listSessions(String user, Object source, Object... args);
static void listProducersInfoAsJSON(Object source) {
- LOGGER.listProducersInfoAsJSON(getCaller(), source);
+ BASE_LOGGER.listProducersInfoAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1018,7 +1019,7 @@ public interface AuditLogger extends BasicLogger {
void listProducersInfoAsJSON(String user, Object source, Object... args);
static void listConnections(Object source, Object... args) {
- LOGGER.listConnections(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listConnections(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1026,7 +1027,7 @@ public interface AuditLogger extends BasicLogger {
void listConnections(String user, Object source, Object... args);
static void listConsumers(Object source, Object... args) {
- LOGGER.listConsumers(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listConsumers(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1034,7 +1035,7 @@ public interface AuditLogger extends BasicLogger {
void listConsumers(String user, Object source, Object... args);
static void listQueues(Object source, Object... args) {
- LOGGER.listQueues(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listQueues(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1042,7 +1043,7 @@ public interface AuditLogger extends BasicLogger {
void listQueues(String user, Object source, Object... args);
static void listProducers(Object source, Object... args) {
- LOGGER.listProducers(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listProducers(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1050,7 +1051,7 @@ public interface AuditLogger extends BasicLogger {
void listProducers(String user, Object source, Object... args);
static void listConnectionsAsJSON(Object source) {
- LOGGER.listConnectionsAsJSON(getCaller(), source);
+ BASE_LOGGER.listConnectionsAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1058,7 +1059,7 @@ public interface AuditLogger extends BasicLogger {
void listConnectionsAsJSON(String user, Object source, Object... args);
static void listSessionsAsJSON(Object source, Object... args) {
- LOGGER.listSessionsAsJSON(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listSessionsAsJSON(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1066,7 +1067,7 @@ public interface AuditLogger extends BasicLogger {
void listSessionsAsJSON(String user, Object source, Object... args);
static void listAllSessionsAsJSON(Object source) {
- LOGGER.listAllSessionsAsJSON(getCaller(), source);
+ BASE_LOGGER.listAllSessionsAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1074,7 +1075,7 @@ public interface AuditLogger extends BasicLogger {
void listAllSessionsAsJSON(String user, Object source, Object... args);
static void listConsumersAsJSON(Object source, Object... args) {
- LOGGER.listConsumersAsJSON(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listConsumersAsJSON(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1082,7 +1083,7 @@ public interface AuditLogger extends BasicLogger {
void listConsumersAsJSON(String user, Object source, Object... args);
static void listAllConsumersAsJSON(Object source) {
- LOGGER.listAllConsumersAsJSON(getCaller(), source);
+ BASE_LOGGER.listAllConsumersAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1090,7 +1091,7 @@ public interface AuditLogger extends BasicLogger {
void listAllConsumersAsJSON(String user, Object source, Object... args);
static void getConnectors(Object source) {
- LOGGER.getConnectors(getCaller(), source);
+ BASE_LOGGER.getConnectors(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1098,7 +1099,7 @@ public interface AuditLogger extends BasicLogger {
void getConnectors(String user, Object source, Object... args);
static void getConnectorsAsJSON(Object source) {
- LOGGER.getConnectorsAsJSON(getCaller(), source);
+ BASE_LOGGER.getConnectorsAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1106,7 +1107,7 @@ public interface AuditLogger extends BasicLogger {
void getConnectorsAsJSON(String user, Object source, Object... args);
static void addSecuritySettings(Object source, Object... args) {
- LOGGER.addSecuritySettings(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.addSecuritySettings(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1114,7 +1115,7 @@ public interface AuditLogger extends BasicLogger {
void addSecuritySettings(String user, Object source, Object... args);
static void removeSecuritySettings(Object source, Object... args) {
- LOGGER.removeSecuritySettings(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeSecuritySettings(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1122,7 +1123,7 @@ public interface AuditLogger extends BasicLogger {
void removeSecuritySettings(String user, Object source, Object... args);
static void getAddressSettingsAsJSON(Object source, Object... args) {
- LOGGER.getAddressSettingsAsJSON(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getAddressSettingsAsJSON(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1130,7 +1131,7 @@ public interface AuditLogger extends BasicLogger {
void getAddressSettingsAsJSON(String user, Object source, Object... args);
static void addAddressSettings(Object source, Object... args) {
- LOGGER.addAddressSettings(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.addAddressSettings(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1138,7 +1139,7 @@ public interface AuditLogger extends BasicLogger {
void addAddressSettings(String user, Object source, Object... args);
static void removeAddressSettings(Object source, Object... args) {
- LOGGER.removeAddressSettings(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeAddressSettings(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1146,7 +1147,7 @@ public interface AuditLogger extends BasicLogger {
void removeAddressSettings(String user, Object source, Object... args);
static void getDivertNames(Object source) {
- LOGGER.getDivertNames(getCaller(), source);
+ BASE_LOGGER.getDivertNames(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1154,7 +1155,7 @@ public interface AuditLogger extends BasicLogger {
void getDivertNames(String user, Object source, Object... args);
static void createDivert(Object source, Object... args) {
- LOGGER.createDivert(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.createDivert(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1162,7 +1163,7 @@ public interface AuditLogger extends BasicLogger {
void createDivert(String user, Object source, Object... args);
static void destroyDivert(Object source, Object... args) {
- LOGGER.destroyDivert(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.destroyDivert(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1170,7 +1171,7 @@ public interface AuditLogger extends BasicLogger {
void destroyDivert(String user, Object source, Object... args);
static void getBridgeNames(Object source) {
- LOGGER.getBridgeNames(getCaller(), source);
+ BASE_LOGGER.getBridgeNames(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1178,7 +1179,7 @@ public interface AuditLogger extends BasicLogger {
void getBridgeNames(String user, Object source, Object... args);
static void createBridge(Object source, Object... args) {
- LOGGER.createBridge(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.createBridge(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1186,7 +1187,7 @@ public interface AuditLogger extends BasicLogger {
void createBridge(String user, Object source, Object... args);
static void destroyBridge(Object source, Object... args) {
- LOGGER.destroyBridge(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.destroyBridge(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1194,7 +1195,7 @@ public interface AuditLogger extends BasicLogger {
void destroyBridge(String user, Object source, Object... args);
static void createConnectorService(Object source, Object... args) {
- LOGGER.createConnectorService(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.createConnectorService(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1202,7 +1203,7 @@ public interface AuditLogger extends BasicLogger {
void createConnectorService(String user, Object source, Object... args);
static void destroyConnectorService(Object source, Object... args) {
- LOGGER.destroyConnectorService(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.destroyConnectorService(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1210,7 +1211,7 @@ public interface AuditLogger extends BasicLogger {
void destroyConnectorService(String user, Object source, Object... args);
static void getConnectorServices(Object source, Object... args) {
- LOGGER.getConnectorServices(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getConnectorServices(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1218,7 +1219,7 @@ public interface AuditLogger extends BasicLogger {
void getConnectorServices(String user, Object source, Object... args);
static void forceFailover(Object source) {
- LOGGER.forceFailover(getCaller(), source);
+ BASE_LOGGER.forceFailover(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1226,7 +1227,7 @@ public interface AuditLogger extends BasicLogger {
void forceFailover(String user, Object source, Object... args);
static void scaleDown(Object source, Object... args) {
- LOGGER.scaleDown(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.scaleDown(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1234,7 +1235,7 @@ public interface AuditLogger extends BasicLogger {
void scaleDown(String user, Object source, Object... args);
static void listNetworkTopology(Object source) {
- LOGGER.listNetworkTopology(getCaller(), source);
+ BASE_LOGGER.listNetworkTopology(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1242,7 +1243,7 @@ public interface AuditLogger extends BasicLogger {
void listNetworkTopology(String user, Object source, Object... args);
static void removeNotificationListener(Object source, Object... args) {
- LOGGER.removeNotificationListener(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeNotificationListener(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1250,7 +1251,7 @@ public interface AuditLogger extends BasicLogger {
void removeNotificationListener(String user, Object source, Object... args);
static void addNotificationListener(Object source, Object... args) {
- LOGGER.addNotificationListener(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.addNotificationListener(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1258,7 +1259,7 @@ public interface AuditLogger extends BasicLogger {
void addNotificationListener(String user, Object source, Object... args);
static void getNotificationInfo(Object source) {
- LOGGER.getNotificationInfo(getCaller(), source);
+ BASE_LOGGER.getNotificationInfo(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1266,7 +1267,7 @@ public interface AuditLogger extends BasicLogger {
void getNotificationInfo(String user, Object source, Object... args);
static void getConnectionTTLOverride(Object source) {
- LOGGER.getConnectionTTLOverride(getCaller(), source);
+ BASE_LOGGER.getConnectionTTLOverride(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1274,7 +1275,7 @@ public interface AuditLogger extends BasicLogger {
void getConnectionTTLOverride(String user, Object source, Object... args);
static void getIDCacheSize(Object source) {
- LOGGER.getIDCacheSize(getCaller(), source);
+ BASE_LOGGER.getIDCacheSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1282,7 +1283,7 @@ public interface AuditLogger extends BasicLogger {
void getIDCacheSize(String user, Object source, Object... args);
static void getLargeMessagesDirectory(Object source) {
- LOGGER.getLargeMessagesDirectory(getCaller(), source);
+ BASE_LOGGER.getLargeMessagesDirectory(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1290,7 +1291,7 @@ public interface AuditLogger extends BasicLogger {
void getLargeMessagesDirectory(String user, Object source, Object... args);
static void getManagementAddress(Object source) {
- LOGGER.getManagementAddress(getCaller(), source);
+ BASE_LOGGER.getManagementAddress(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1298,7 +1299,7 @@ public interface AuditLogger extends BasicLogger {
void getManagementAddress(String user, Object source, Object... args);
static void getNodeID(Object source) {
- LOGGER.getNodeID(getCaller(), source);
+ BASE_LOGGER.getNodeID(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1306,7 +1307,7 @@ public interface AuditLogger extends BasicLogger {
void getNodeID(String user, Object source, Object... args);
static void getManagementNotificationAddress(Object source) {
- LOGGER.getManagementNotificationAddress(getCaller(), source);
+ BASE_LOGGER.getManagementNotificationAddress(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1314,7 +1315,7 @@ public interface AuditLogger extends BasicLogger {
void getManagementNotificationAddress(String user, Object source, Object... args);
static void getMessageExpiryScanPeriod(Object source) {
- LOGGER.getMessageExpiryScanPeriod(getCaller(), source);
+ BASE_LOGGER.getMessageExpiryScanPeriod(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1322,7 +1323,7 @@ public interface AuditLogger extends BasicLogger {
void getMessageExpiryScanPeriod(String user, Object source, Object... args);
static void getMessageExpiryThreadPriority(Object source) {
- LOGGER.getMessageExpiryThreadPriority(getCaller(), source);
+ BASE_LOGGER.getMessageExpiryThreadPriority(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1330,7 +1331,7 @@ public interface AuditLogger extends BasicLogger {
void getMessageExpiryThreadPriority(String user, Object source, Object... args);
static void getTransactionTimeout(Object source) {
- LOGGER.getTransactionTimeout(getCaller(), source);
+ BASE_LOGGER.getTransactionTimeout(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1338,7 +1339,7 @@ public interface AuditLogger extends BasicLogger {
void getTransactionTimeout(String user, Object source, Object... args);
static void getTransactionTimeoutScanPeriod(Object source) {
- LOGGER.getTransactionTimeoutScanPeriod(getCaller(), source);
+ BASE_LOGGER.getTransactionTimeoutScanPeriod(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1346,7 +1347,7 @@ public interface AuditLogger extends BasicLogger {
void getTransactionTimeoutScanPeriod(String user, Object source, Object... args);
static void isPersistDeliveryCountBeforeDelivery(Object source) {
- LOGGER.isPersistDeliveryCountBeforeDelivery(getCaller(), source);
+ BASE_LOGGER.isPersistDeliveryCountBeforeDelivery(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1354,7 +1355,7 @@ public interface AuditLogger extends BasicLogger {
void isPersistDeliveryCountBeforeDelivery(String user, Object source, Object... args);
static void isPersistIDCache(Object source) {
- LOGGER.isPersistIDCache(getCaller(), source);
+ BASE_LOGGER.isPersistIDCache(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1362,7 +1363,7 @@ public interface AuditLogger extends BasicLogger {
void isPersistIDCache(String user, Object source, Object... args);
static void isWildcardRoutingEnabled(Object source) {
- LOGGER.isWildcardRoutingEnabled(getCaller(), source);
+ BASE_LOGGER.isWildcardRoutingEnabled(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1370,7 +1371,7 @@ public interface AuditLogger extends BasicLogger {
void isWildcardRoutingEnabled(String user, Object source, Object... args);
static void addUser(Object source, Object... args) {
- LOGGER.addUser(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.addUser(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1378,7 +1379,7 @@ public interface AuditLogger extends BasicLogger {
void addUser(String user, Object source, Object... args);
static void listUser(Object source, Object... args) {
- LOGGER.listUser(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listUser(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1386,7 +1387,7 @@ public interface AuditLogger extends BasicLogger {
void listUser(String user, Object source, Object... args);
static void removeUser(Object source, Object... args) {
- LOGGER.removeUser(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeUser(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1394,7 +1395,7 @@ public interface AuditLogger extends BasicLogger {
void removeUser(String user, Object source, Object... args);
static void resetUser(Object source, Object... args) {
- LOGGER.resetUser(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.resetUser(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1402,7 +1403,7 @@ public interface AuditLogger extends BasicLogger {
void resetUser(String user, Object source, Object... args);
static void getUser(Object source) {
- LOGGER.getUser(getCaller(), source);
+ BASE_LOGGER.getUser(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1410,7 +1411,7 @@ public interface AuditLogger extends BasicLogger {
void getUser(String user, Object source, Object... args);
static void getRoutingType(Object source) {
- LOGGER.getRoutingType(getCaller(), source);
+ BASE_LOGGER.getRoutingType(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1418,7 +1419,7 @@ public interface AuditLogger extends BasicLogger {
void getRoutingType(String user, Object source, Object... args);
static void isTemporary(Object source) {
- LOGGER.isTemporary(getCaller(), source);
+ BASE_LOGGER.isTemporary(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1426,7 +1427,7 @@ public interface AuditLogger extends BasicLogger {
void isTemporary(String user, Object source, Object... args);
static void getPersistentSize(Object source) {
- LOGGER.getPersistentSize(getCaller(), source);
+ BASE_LOGGER.getPersistentSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1434,7 +1435,7 @@ public interface AuditLogger extends BasicLogger {
void getPersistentSize(String user, Object source, Object... args);
static void getDurableMessageCount(Object source) {
- LOGGER.getDurableMessageCount(getCaller(), source);
+ BASE_LOGGER.getDurableMessageCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1442,7 +1443,7 @@ public interface AuditLogger extends BasicLogger {
void getDurableMessageCount(String user, Object source, Object... args);
static void getDurablePersistSize(Object source) {
- LOGGER.getDurablePersistSize(getCaller(), source);
+ BASE_LOGGER.getDurablePersistSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1450,7 +1451,7 @@ public interface AuditLogger extends BasicLogger {
void getDurablePersistSize(String user, Object source, Object... args);
static void getConsumerCount(Object source) {
- LOGGER.getConsumerCount(getCaller(), source);
+ BASE_LOGGER.getConsumerCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1458,7 +1459,7 @@ public interface AuditLogger extends BasicLogger {
void getConsumerCount(String user, Object source, Object... args);
static void getDeliveringCount(Object source) {
- LOGGER.getDeliveringCount(getCaller(), source);
+ BASE_LOGGER.getDeliveringCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1466,7 +1467,7 @@ public interface AuditLogger extends BasicLogger {
void getDeliveringCount(String user, Object source, Object... args);
static void getDeliveringSize(Object source) {
- LOGGER.getDeliveringSize(getCaller(), source);
+ BASE_LOGGER.getDeliveringSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1474,7 +1475,7 @@ public interface AuditLogger extends BasicLogger {
void getDeliveringSize(String user, Object source, Object... args);
static void getDurableDeliveringCount(Object source) {
- LOGGER.getDurableDeliveringCount(getCaller(), source);
+ BASE_LOGGER.getDurableDeliveringCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1482,7 +1483,7 @@ public interface AuditLogger extends BasicLogger {
void getDurableDeliveringCount(String user, Object source, Object... args);
static void getDurableDeliveringSize(Object source) {
- LOGGER.getDurableDeliveringSize(getCaller(), source);
+ BASE_LOGGER.getDurableDeliveringSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1490,7 +1491,7 @@ public interface AuditLogger extends BasicLogger {
void getDurableDeliveringSize(String user, Object source, Object... args);
static void getMessagesAdded(Object source) {
- LOGGER.getMessagesAdded(getCaller(), source);
+ BASE_LOGGER.getMessagesAdded(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1498,7 +1499,7 @@ public interface AuditLogger extends BasicLogger {
void getMessagesAdded(String user, Object source, Object... args);
static void getMessagesAcknowledged(Object source) {
- LOGGER.getMessagesAcknowledged(getCaller(), source);
+ BASE_LOGGER.getMessagesAcknowledged(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1506,7 +1507,7 @@ public interface AuditLogger extends BasicLogger {
void getMessagesAcknowledged(String user, Object source, Object... args);
static void getMessagesExpired(Object source) {
- LOGGER.getMessagesExpired(getCaller(), source);
+ BASE_LOGGER.getMessagesExpired(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1514,7 +1515,7 @@ public interface AuditLogger extends BasicLogger {
void getMessagesExpired(String user, Object source, Object... args);
static void getMessagesKilled(Object source) {
- LOGGER.getMessagesKilled(getCaller(), source);
+ BASE_LOGGER.getMessagesKilled(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1522,7 +1523,7 @@ public interface AuditLogger extends BasicLogger {
void getMessagesKilled(String user, Object source, Object... args);
static void getID(Object source) {
- LOGGER.getID(getCaller(), source);
+ BASE_LOGGER.getID(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1530,7 +1531,7 @@ public interface AuditLogger extends BasicLogger {
void getID(String user, Object source, Object... args);
static void getScheduledCount(Object source) {
- LOGGER.getScheduledCount(getCaller(), source);
+ BASE_LOGGER.getScheduledCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1538,7 +1539,7 @@ public interface AuditLogger extends BasicLogger {
void getScheduledCount(String user, Object source, Object... args);
static void getScheduledSize(Object source) {
- LOGGER.getScheduledSize(getCaller(), source);
+ BASE_LOGGER.getScheduledSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1546,7 +1547,7 @@ public interface AuditLogger extends BasicLogger {
void getScheduledSize(String user, Object source, Object... args);
static void getDurableScheduledCount(Object source) {
- LOGGER.getDurableScheduledCount(getCaller(), source);
+ BASE_LOGGER.getDurableScheduledCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1554,7 +1555,7 @@ public interface AuditLogger extends BasicLogger {
void getDurableScheduledCount(String user, Object source, Object... args);
static void getDurableScheduledSize(Object source) {
- LOGGER.getDurableScheduledSize(getCaller(), source);
+ BASE_LOGGER.getDurableScheduledSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1562,7 +1563,7 @@ public interface AuditLogger extends BasicLogger {
void getDurableScheduledSize(String user, Object source, Object... args);
static void getDeadLetterAddress(Object source) {
- LOGGER.getDeadLetterAddress(getCaller(), source);
+ BASE_LOGGER.getDeadLetterAddress(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1570,7 +1571,7 @@ public interface AuditLogger extends BasicLogger {
void getDeadLetterAddress(String user, Object source, Object... args);
static void getExpiryAddress(Object source) {
- LOGGER.getExpiryAddress(getCaller(), source);
+ BASE_LOGGER.getExpiryAddress(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1578,7 +1579,7 @@ public interface AuditLogger extends BasicLogger {
void getExpiryAddress(String user, Object source, Object... args);
static void getMaxConsumers(Object source) {
- LOGGER.getMaxConsumers(getCaller(), source);
+ BASE_LOGGER.getMaxConsumers(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1586,7 +1587,7 @@ public interface AuditLogger extends BasicLogger {
void getMaxConsumers(String user, Object source, Object... args);
static void isPurgeOnNoConsumers(Object source) {
- LOGGER.isPurgeOnNoConsumers(getCaller(), source);
+ BASE_LOGGER.isPurgeOnNoConsumers(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1594,7 +1595,7 @@ public interface AuditLogger extends BasicLogger {
void isPurgeOnNoConsumers(String user, Object source, Object... args);
static void isConfigurationManaged(Object source) {
- LOGGER.isConfigurationManaged(getCaller(), source);
+ BASE_LOGGER.isConfigurationManaged(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1602,7 +1603,7 @@ public interface AuditLogger extends BasicLogger {
void isConfigurationManaged(String user, Object source, Object... args);
static void isExclusive(Object source) {
- LOGGER.isExclusive(getCaller(), source);
+ BASE_LOGGER.isExclusive(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1610,7 +1611,7 @@ public interface AuditLogger extends BasicLogger {
void isExclusive(String user, Object source, Object... args);
static void isLastValue(Object source) {
- LOGGER.isLastValue(getCaller(), source);
+ BASE_LOGGER.isLastValue(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1618,7 +1619,7 @@ public interface AuditLogger extends BasicLogger {
void isLastValue(String user, Object source, Object... args);
static void listScheduledMessages(Object source) {
- LOGGER.listScheduledMessages(getCaller(), source);
+ BASE_LOGGER.listScheduledMessages(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1626,7 +1627,7 @@ public interface AuditLogger extends BasicLogger {
void listScheduledMessages(String user, Object source, Object... args);
static void listScheduledMessagesAsJSON(Object source) {
- LOGGER.listScheduledMessagesAsJSON(getCaller(), source);
+ BASE_LOGGER.listScheduledMessagesAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1634,7 +1635,7 @@ public interface AuditLogger extends BasicLogger {
void listScheduledMessagesAsJSON(String user, Object source, Object... args);
static void listDeliveringMessages(Object source) {
- LOGGER.listDeliveringMessages(getCaller(), source);
+ BASE_LOGGER.listDeliveringMessages(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1642,7 +1643,7 @@ public interface AuditLogger extends BasicLogger {
void listDeliveringMessages(String user, Object source, Object... args);
static void listDeliveringMessagesAsJSON(Object source) {
- LOGGER.listDeliveringMessagesAsJSON(getCaller(), source);
+ BASE_LOGGER.listDeliveringMessagesAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1650,7 +1651,7 @@ public interface AuditLogger extends BasicLogger {
void listDeliveringMessagesAsJSON(String user, Object source, Object... args);
static void listMessages(Object source, Object... args) {
- LOGGER.listMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listMessages(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1658,7 +1659,7 @@ public interface AuditLogger extends BasicLogger {
void listMessages(String user, Object source, Object... args);
static void listMessagesAsJSON(Object source) {
- LOGGER.listMessagesAsJSON(getCaller(), source);
+ BASE_LOGGER.listMessagesAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1666,7 +1667,7 @@ public interface AuditLogger extends BasicLogger {
void listMessagesAsJSON(String user, Object source, Object... args);
static void getFirstMessage(Object source) {
- LOGGER.getFirstMessage(getCaller(), source);
+ BASE_LOGGER.getFirstMessage(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1674,7 +1675,7 @@ public interface AuditLogger extends BasicLogger {
void getFirstMessage(String user, Object source, Object... args);
static void getFirstMessageAsJSON(Object source) {
- LOGGER.getFirstMessageAsJSON(getCaller(), source);
+ BASE_LOGGER.getFirstMessageAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1682,7 +1683,7 @@ public interface AuditLogger extends BasicLogger {
void getFirstMessageAsJSON(String user, Object source, Object... args);
static void getFirstMessageTimestamp(Object source) {
- LOGGER.getFirstMessageTimestamp(getCaller(), source);
+ BASE_LOGGER.getFirstMessageTimestamp(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1690,7 +1691,7 @@ public interface AuditLogger extends BasicLogger {
void getFirstMessageTimestamp(String user, Object source, Object... args);
static void getFirstMessageAge(Object source) {
- LOGGER.getFirstMessageAge(getCaller(), source);
+ BASE_LOGGER.getFirstMessageAge(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1698,7 +1699,7 @@ public interface AuditLogger extends BasicLogger {
void getFirstMessageAge(String user, Object source, Object... args);
static void countMessages(Object source, Object... args) {
- LOGGER.countMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.countMessages(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1706,7 +1707,7 @@ public interface AuditLogger extends BasicLogger {
void countMessages(String user, Object source, Object... args);
static void countDeliveringMessages(Object source, Object... args) {
- LOGGER.countDeliveringMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.countDeliveringMessages(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1714,7 +1715,7 @@ public interface AuditLogger extends BasicLogger {
void countDeliveringMessages(String user, Object source, Object... args);
static void removeMessage(Object source, Object... args) {
- LOGGER.removeMessage(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeMessage(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1722,7 +1723,7 @@ public interface AuditLogger extends BasicLogger {
void removeMessage(String user, Object source, Object... args);
static void removeMessages(Object source, Object... args) {
- LOGGER.removeMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeMessages(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1730,7 +1731,7 @@ public interface AuditLogger extends BasicLogger {
void removeMessages(String user, Object source, Object... args);
static void expireMessage(Object source, Object... args) {
- LOGGER.expireMessage(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.expireMessage(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1738,7 +1739,7 @@ public interface AuditLogger extends BasicLogger {
void expireMessage(String user, Object source, Object... args);
static void expireMessages(Object source, Object... args) {
- LOGGER.expireMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.expireMessages(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1746,7 +1747,7 @@ public interface AuditLogger extends BasicLogger {
void expireMessages(String user, Object source, Object... args);
static void retryMessage(Object source, Object... args) {
- LOGGER.retryMessage(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.retryMessage(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1754,7 +1755,7 @@ public interface AuditLogger extends BasicLogger {
void retryMessage(String user, Object source, Object... args);
static void retryMessages(Object source) {
- LOGGER.retryMessages(getCaller(), source);
+ BASE_LOGGER.retryMessages(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1762,7 +1763,7 @@ public interface AuditLogger extends BasicLogger {
void retryMessages(String user, Object source, Object... args);
static void moveMessage(Object source, Object... args) {
- LOGGER.moveMessage(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.moveMessage(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1770,7 +1771,7 @@ public interface AuditLogger extends BasicLogger {
void moveMessage(String user, Object source, Object... args);
static void moveMessages(Object source, Object... args) {
- LOGGER.moveMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.moveMessages(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1778,7 +1779,7 @@ public interface AuditLogger extends BasicLogger {
void moveMessages(String user, Object source, Object... args);
static void sendMessagesToDeadLetterAddress(Object source, Object... args) {
- LOGGER.sendMessagesToDeadLetterAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.sendMessagesToDeadLetterAddress(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1786,7 +1787,7 @@ public interface AuditLogger extends BasicLogger {
void sendMessagesToDeadLetterAddress(String user, Object source, Object... args);
static void sendMessageToDeadLetterAddress(Object source, Object... args) {
- LOGGER.sendMessageToDeadLetterAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.sendMessageToDeadLetterAddress(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1794,7 +1795,7 @@ public interface AuditLogger extends BasicLogger {
void sendMessageToDeadLetterAddress(String user, Object source, Object... args);
static void changeMessagesPriority(Object source, Object... args) {
- LOGGER.changeMessagesPriority(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.changeMessagesPriority(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1802,7 +1803,7 @@ public interface AuditLogger extends BasicLogger {
void changeMessagesPriority(String user, Object source, Object... args);
static void changeMessagePriority(Object source, Object... args) {
- LOGGER.changeMessagePriority(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.changeMessagePriority(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1810,7 +1811,7 @@ public interface AuditLogger extends BasicLogger {
void changeMessagePriority(String user, Object source, Object... args);
static void listMessageCounter(Object source) {
- LOGGER.listMessageCounter(getCaller(), source);
+ BASE_LOGGER.listMessageCounter(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1818,7 +1819,7 @@ public interface AuditLogger extends BasicLogger {
void listMessageCounter(String user, Object source, Object... args);
static void resetMessageCounter(Object source) {
- LOGGER.resetMessageCounter(getCaller(), source);
+ BASE_LOGGER.resetMessageCounter(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1826,7 +1827,7 @@ public interface AuditLogger extends BasicLogger {
void resetMessageCounter(String user, Object source, Object... args);
static void listMessageCounterAsHTML(Object source) {
- LOGGER.listMessageCounterAsHTML(getCaller(), source);
+ BASE_LOGGER.listMessageCounterAsHTML(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1834,7 +1835,7 @@ public interface AuditLogger extends BasicLogger {
void listMessageCounterAsHTML(String user, Object source, Object... args);
static void listMessageCounterHistory(Object source) {
- LOGGER.listMessageCounterHistory(getCaller(), source);
+ BASE_LOGGER.listMessageCounterHistory(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1842,7 +1843,7 @@ public interface AuditLogger extends BasicLogger {
void listMessageCounterHistory(String user, Object source, Object... args);
static void listMessageCounterHistoryAsHTML(Object source) {
- LOGGER.listMessageCounterHistoryAsHTML(getCaller(), source);
+ BASE_LOGGER.listMessageCounterHistoryAsHTML(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1850,7 +1851,7 @@ public interface AuditLogger extends BasicLogger {
void listMessageCounterHistoryAsHTML(String user, Object source, Object... args);
static void pause(Object source, Object... args) {
- LOGGER.pause(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.pause(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1858,7 +1859,7 @@ public interface AuditLogger extends BasicLogger {
void pause(String user, Object source, Object... args);
static void resume(Object source) {
- LOGGER.resume(getCaller(), source);
+ BASE_LOGGER.resume(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1866,7 +1867,7 @@ public interface AuditLogger extends BasicLogger {
void resume(String user, Object source, Object... args);
static void isPaused(Object source) {
- LOGGER.isPaused(getCaller(), source);
+ BASE_LOGGER.isPaused(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1874,7 +1875,7 @@ public interface AuditLogger extends BasicLogger {
void isPaused(String user, Object source, Object... args);
static void browse(Object source, Object... args) {
- LOGGER.browse(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.browse(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1882,7 +1883,7 @@ public interface AuditLogger extends BasicLogger {
void browse(String user, Object source, Object... args);
static void flushExecutor(Object source) {
- LOGGER.flushExecutor(getCaller(), source);
+ BASE_LOGGER.flushExecutor(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1890,7 +1891,7 @@ public interface AuditLogger extends BasicLogger {
void flushExecutor(String user, Object source, Object... args);
static void resetAllGroups(Object source) {
- LOGGER.resetAllGroups(getCaller(), source);
+ BASE_LOGGER.resetAllGroups(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1898,7 +1899,7 @@ public interface AuditLogger extends BasicLogger {
void resetAllGroups(String user, Object source, Object... args);
static void resetGroup(Object source, Object... args) {
- LOGGER.resetGroup(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.resetGroup(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1906,7 +1907,7 @@ public interface AuditLogger extends BasicLogger {
void resetGroup(String user, Object source, Object... args);
static void getGroupCount(Object source, Object... args) {
- LOGGER.getGroupCount(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getGroupCount(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -1914,7 +1915,7 @@ public interface AuditLogger extends BasicLogger {
void getGroupCount(String user, Object source, Object... args);
static void listGroupsAsJSON(Object source) {
- LOGGER.listGroupsAsJSON(getCaller(), source);
+ BASE_LOGGER.listGroupsAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1922,7 +1923,7 @@ public interface AuditLogger extends BasicLogger {
void listGroupsAsJSON(String user, Object source, Object... args);
static void resetMessagesAdded(Object source) {
- LOGGER.resetMessagesAdded(getCaller(), source);
+ BASE_LOGGER.resetMessagesAdded(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1930,7 +1931,7 @@ public interface AuditLogger extends BasicLogger {
void resetMessagesAdded(String user, Object source, Object... args);
static void resetMessagesAcknowledged(Object source) {
- LOGGER.resetMessagesAcknowledged(getCaller(), source);
+ BASE_LOGGER.resetMessagesAcknowledged(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1938,7 +1939,7 @@ public interface AuditLogger extends BasicLogger {
void resetMessagesAcknowledged(String user, Object source, Object... args);
static void resetMessagesExpired(Object source) {
- LOGGER.resetMessagesExpired(getCaller(), source);
+ BASE_LOGGER.resetMessagesExpired(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1946,7 +1947,7 @@ public interface AuditLogger extends BasicLogger {
void resetMessagesExpired(String user, Object source, Object... args);
static void resetMessagesKilled(Object source) {
- LOGGER.resetMessagesKilled(getCaller(), source);
+ BASE_LOGGER.resetMessagesKilled(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1954,7 +1955,7 @@ public interface AuditLogger extends BasicLogger {
void resetMessagesKilled(String user, Object source, Object... args);
static void getStaticConnectors(Object source) {
- LOGGER.getStaticConnectors(getCaller(), source);
+ BASE_LOGGER.getStaticConnectors(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1962,7 +1963,7 @@ public interface AuditLogger extends BasicLogger {
void getStaticConnectors(String user, Object source, Object... args);
static void getForwardingAddress(Object source) {
- LOGGER.getForwardingAddress(getCaller(), source);
+ BASE_LOGGER.getForwardingAddress(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1970,7 +1971,7 @@ public interface AuditLogger extends BasicLogger {
void getForwardingAddress(String user, Object source, Object... args);
static void getQueueName(Object source) {
- LOGGER.getQueueName(getCaller(), source);
+ BASE_LOGGER.getQueueName(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1978,7 +1979,7 @@ public interface AuditLogger extends BasicLogger {
void getQueueName(String user, Object source, Object... args);
static void getDiscoveryGroupName(Object source) {
- LOGGER.getDiscoveryGroupName(getCaller(), source);
+ BASE_LOGGER.getDiscoveryGroupName(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1986,7 +1987,7 @@ public interface AuditLogger extends BasicLogger {
void getDiscoveryGroupName(String user, Object source, Object... args);
static void getFilterString(Object source) {
- LOGGER.getFilterString(getCaller(), source);
+ BASE_LOGGER.getFilterString(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -1994,7 +1995,7 @@ public interface AuditLogger extends BasicLogger {
void getFilterString(String user, Object source, Object... args);
static void getReconnectAttempts(Object source) {
- LOGGER.getReconnectAttempts(getCaller(), source);
+ BASE_LOGGER.getReconnectAttempts(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2002,7 +2003,7 @@ public interface AuditLogger extends BasicLogger {
void getReconnectAttempts(String user, Object source, Object... args);
static void getRetryInterval(Object source) {
- LOGGER.getRetryInterval(getCaller(), source);
+ BASE_LOGGER.getRetryInterval(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2010,7 +2011,7 @@ public interface AuditLogger extends BasicLogger {
void getRetryInterval(String user, Object source, Object... args);
static void getRetryIntervalMultiplier(Object source) {
- LOGGER.getRetryIntervalMultiplier(getCaller(), source);
+ BASE_LOGGER.getRetryIntervalMultiplier(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2018,7 +2019,7 @@ public interface AuditLogger extends BasicLogger {
void getRetryIntervalMultiplier(String user, Object source, Object... args);
static void getTransformerClassName(Object source) {
- LOGGER.getTransformerClassName(getCaller(), source);
+ BASE_LOGGER.getTransformerClassName(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2026,7 +2027,7 @@ public interface AuditLogger extends BasicLogger {
void getTransformerClassName(String user, Object source, Object... args);
static void getTransformerPropertiesAsJSON(Object source) {
- LOGGER.getTransformerPropertiesAsJSON(getCaller(), source);
+ BASE_LOGGER.getTransformerPropertiesAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2034,7 +2035,7 @@ public interface AuditLogger extends BasicLogger {
void getTransformerPropertiesAsJSON(String user, Object source, Object... args);
static void getTransformerProperties(Object source) {
- LOGGER.getTransformerProperties(getCaller(), source);
+ BASE_LOGGER.getTransformerProperties(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2042,7 +2043,7 @@ public interface AuditLogger extends BasicLogger {
void getTransformerProperties(String user, Object source, Object... args);
static void isStartedBridge(Object source) {
- LOGGER.isStartedBridge(getCaller(), source);
+ BASE_LOGGER.isStartedBridge(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2050,7 +2051,7 @@ public interface AuditLogger extends BasicLogger {
void isStartedBridge(String user, Object source, Object... args);
static void isUseDuplicateDetection(Object source) {
- LOGGER.isUseDuplicateDetection(getCaller(), source);
+ BASE_LOGGER.isUseDuplicateDetection(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2058,7 +2059,7 @@ public interface AuditLogger extends BasicLogger {
void isUseDuplicateDetection(String user, Object source, Object... args);
static void isHA(Object source) {
- LOGGER.isHA(getCaller(), source);
+ BASE_LOGGER.isHA(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2066,7 +2067,7 @@ public interface AuditLogger extends BasicLogger {
void isHA(String user, Object source, Object... args);
static void startBridge(Object source) {
- LOGGER.startBridge(getCaller(), source);
+ BASE_LOGGER.startBridge(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2074,7 +2075,7 @@ public interface AuditLogger extends BasicLogger {
void startBridge(String user, Object source, Object... args);
static void stopBridge(Object source) {
- LOGGER.stopBridge(getCaller(), source);
+ BASE_LOGGER.stopBridge(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2082,7 +2083,7 @@ public interface AuditLogger extends BasicLogger {
void stopBridge(String user, Object source, Object... args);
static void getMessagesPendingAcknowledgement(Object source) {
- LOGGER.getMessagesPendingAcknowledgement(getCaller(), source);
+ BASE_LOGGER.getMessagesPendingAcknowledgement(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2090,7 +2091,7 @@ public interface AuditLogger extends BasicLogger {
void getMessagesPendingAcknowledgement(String user, Object source, Object... args);
static void getMetrics(Object source) {
- LOGGER.getMetrics(getCaller(), source);
+ BASE_LOGGER.getMetrics(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2098,7 +2099,7 @@ public interface AuditLogger extends BasicLogger {
void getMetrics(String user, Object source, Object... args);
static void getBroadcastPeriod(Object source) {
- LOGGER.getBroadcastPeriod(getCaller(), source);
+ BASE_LOGGER.getBroadcastPeriod(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2106,7 +2107,7 @@ public interface AuditLogger extends BasicLogger {
void getBroadcastPeriod(String user, Object source, Object... args);
static void getConnectorPairs(Object source) {
- LOGGER.getConnectorPairs(getCaller(), source);
+ BASE_LOGGER.getConnectorPairs(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2114,7 +2115,7 @@ public interface AuditLogger extends BasicLogger {
void getConnectorPairs(String user, Object source, Object... args);
static void getConnectorPairsAsJSON(Object source) {
- LOGGER.getConnectorPairsAsJSON(getCaller(), source);
+ BASE_LOGGER.getConnectorPairsAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2122,7 +2123,7 @@ public interface AuditLogger extends BasicLogger {
void getConnectorPairsAsJSON(String user, Object source, Object... args);
static void getGroupAddress(Object source) {
- LOGGER.getGroupAddress(getCaller(), source);
+ BASE_LOGGER.getGroupAddress(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2130,7 +2131,7 @@ public interface AuditLogger extends BasicLogger {
void getGroupAddress(String user, Object source, Object... args);
static void getGroupPort(Object source) {
- LOGGER.getGroupPort(getCaller(), source);
+ BASE_LOGGER.getGroupPort(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2138,7 +2139,7 @@ public interface AuditLogger extends BasicLogger {
void getGroupPort(String user, Object source, Object... args);
static void getLocalBindPort(Object source) {
- LOGGER.getLocalBindPort(getCaller(), source);
+ BASE_LOGGER.getLocalBindPort(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2146,7 +2147,7 @@ public interface AuditLogger extends BasicLogger {
void getLocalBindPort(String user, Object source, Object... args);
static void startBroadcastGroup(Object source) {
- LOGGER.startBroadcastGroup(getCaller(), source);
+ BASE_LOGGER.startBroadcastGroup(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2154,7 +2155,7 @@ public interface AuditLogger extends BasicLogger {
void startBroadcastGroup(String user, Object source, Object... args);
static void stopBroadcastGroup(Object source) {
- LOGGER.stopBroadcastGroup(getCaller(), source);
+ BASE_LOGGER.stopBroadcastGroup(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2162,7 +2163,7 @@ public interface AuditLogger extends BasicLogger {
void stopBroadcastGroup(String user, Object source, Object... args);
static void getMaxHops(Object source) {
- LOGGER.getMaxHops(getCaller(), source);
+ BASE_LOGGER.getMaxHops(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2170,7 +2171,7 @@ public interface AuditLogger extends BasicLogger {
void getMaxHops(String user, Object source, Object... args);
static void getStaticConnectorsAsJSON(Object source) {
- LOGGER.getStaticConnectorsAsJSON(getCaller(), source);
+ BASE_LOGGER.getStaticConnectorsAsJSON(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2178,7 +2179,7 @@ public interface AuditLogger extends BasicLogger {
void getStaticConnectorsAsJSON(String user, Object source, Object... args);
static void isDuplicateDetection(Object source) {
- LOGGER.isDuplicateDetection(getCaller(), source);
+ BASE_LOGGER.isDuplicateDetection(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2186,7 +2187,7 @@ public interface AuditLogger extends BasicLogger {
void isDuplicateDetection(String user, Object source, Object... args);
static void getMessageLoadBalancingType(Object source) {
- LOGGER.getMessageLoadBalancingType(getCaller(), source);
+ BASE_LOGGER.getMessageLoadBalancingType(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2194,7 +2195,7 @@ public interface AuditLogger extends BasicLogger {
void getMessageLoadBalancingType(String user, Object source, Object... args);
static void getTopology(Object source) {
- LOGGER.getTopology(getCaller(), source);
+ BASE_LOGGER.getTopology(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2202,7 +2203,7 @@ public interface AuditLogger extends BasicLogger {
void getTopology(String user, Object source, Object... args);
static void getNodes(Object source) {
- LOGGER.getNodes(getCaller(), source);
+ BASE_LOGGER.getNodes(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2210,7 +2211,7 @@ public interface AuditLogger extends BasicLogger {
void getNodes(String user, Object source, Object... args);
static void startClusterConnection(Object source) {
- LOGGER.startClusterConnection(getCaller(), source);
+ BASE_LOGGER.startClusterConnection(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2218,7 +2219,7 @@ public interface AuditLogger extends BasicLogger {
void startClusterConnection(String user, Object source, Object... args);
static void stopClusterConnection(Object source) {
- LOGGER.stopClusterConnection(getCaller(), source);
+ BASE_LOGGER.stopClusterConnection(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2226,7 +2227,7 @@ public interface AuditLogger extends BasicLogger {
void stopClusterConnection(String user, Object source, Object... args);
static void getBridgeMetrics(Object source, Object... args) {
- LOGGER.getBridgeMetrics(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getBridgeMetrics(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -2234,7 +2235,7 @@ public interface AuditLogger extends BasicLogger {
void getBridgeMetrics(String user, Object source, Object... args);
static void getRoutingName(Object source) {
- LOGGER.getRoutingName(getCaller(), source);
+ BASE_LOGGER.getRoutingName(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2242,23 +2243,23 @@ public interface AuditLogger extends BasicLogger {
void getRoutingName(String user, Object source, Object... args);
static void getUniqueName(Object source) {
- LOGGER.getUniqueName(getCaller(), source);
+ BASE_LOGGER.getUniqueName(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601261, value = "User {0} is getting unique name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
void getUniqueName(String user, Object source, Object... args);
- static void serverSessionCreateAddress(Object source, String user, Object... args) {
- LOGGER.serverSessionCreateAddress2(getCaller(user), source, arrayToString(args));
+ static void serverSessionCreateAddress(Object source, Subject user, String remoteAddress, Object... args) {
+ BASE_LOGGER.serverSessionCreateAddress2(getCaller(user, remoteAddress), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601262, value = "User {0} is creating address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
void serverSessionCreateAddress2(String user, Object source, Object... args);
- static void handleManagementMessage(Object source, String user, Object... args) {
- LOGGER.handleManagementMessage2(getCaller(user), source, arrayToString(args));
+ static void handleManagementMessage(Object source, Subject user, String remoteAddress, Object... args) {
+ BASE_LOGGER.handleManagementMessage2(getCaller(user, remoteAddress), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -2267,7 +2268,7 @@ public interface AuditLogger extends BasicLogger {
static void securityFailure(Exception cause) {
- LOGGER.securityFailure(getCaller(), cause);
+ BASE_LOGGER.securityFailure(getCaller(), cause);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2275,24 +2276,24 @@ public interface AuditLogger extends BasicLogger {
void securityFailure(String user, @Cause Throwable cause);
- static void createCoreConsumer(Object source, String user, Object... args) {
- LOGGER.createCoreConsumer(getCaller(user), source, arrayToString(args));
+ static void createCoreConsumer(Object source, Subject user, String remoteAddress, Object... args) {
+ BASE_LOGGER.createCoreConsumer(getCaller(user, remoteAddress), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601265, value = "User {0} is creating a core consumer on target resource {1} {2}", format = Message.Format.MESSAGE_FORMAT)
void createCoreConsumer(String user, Object source, Object... args);
- static void createSharedQueue(Object source, String user, Object... args) {
- LOGGER.createSharedQueue(getCaller(user), source, arrayToString(args));
+ static void createSharedQueue(Object source, Subject user, String remoteAddress, Object... args) {
+ BASE_LOGGER.createSharedQueue(getCaller(user, remoteAddress), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601266, value = "User {0} is creating a shared queue on target resource {1} {2}", format = Message.Format.MESSAGE_FORMAT)
void createSharedQueue(String user, Object source, Object... args);
- static void createCoreSession(Object source, Object... args) {
- LOGGER.createCoreSession(getCaller(), source, arrayToString(args));
+ static void createCoreSession(Object source, Subject user, String remoteAddress, Object... args) {
+ BASE_LOGGER.createCoreSession(getCaller(user, remoteAddress), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -2300,7 +2301,7 @@ public interface AuditLogger extends BasicLogger {
void createCoreSession(String user, Object source, Object... args);
static void getAcknowledgeAttempts(Object source) {
- LOGGER.getMessagesAcknowledged(getCaller(), source);
+ BASE_LOGGER.getMessagesAcknowledged(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2308,7 +2309,7 @@ public interface AuditLogger extends BasicLogger {
void getAcknowledgeAttempts(String user, Object source, Object... args);
static void getRingSize(Object source, Object... args) {
- LOGGER.getRingSize(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getRingSize(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -2317,7 +2318,7 @@ public interface AuditLogger extends BasicLogger {
static void isRetroactiveResource(Object source) {
- LOGGER.isRetroactiveResource(getCaller(), source);
+ BASE_LOGGER.isRetroactiveResource(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2325,7 +2326,7 @@ public interface AuditLogger extends BasicLogger {
void isRetroactiveResource(String user, Object source, Object... args);
static void getDiskStoreUsage(Object source) {
- LOGGER.getDiskStoreUsage(getCaller(), source);
+ BASE_LOGGER.getDiskStoreUsage(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2333,7 +2334,7 @@ public interface AuditLogger extends BasicLogger {
void getDiskStoreUsage(String user, Object source, Object... args);
static void getDiskStoreUsagePercentage(Object source) {
- LOGGER.getDiskStoreUsagePercentage(getCaller(), source);
+ BASE_LOGGER.getDiskStoreUsagePercentage(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2341,7 +2342,7 @@ public interface AuditLogger extends BasicLogger {
void getDiskStoreUsagePercentage(String user, Object source, Object... args);
static void isGroupRebalance(Object source) {
- LOGGER.isGroupRebalance(getCaller(), source);
+ BASE_LOGGER.isGroupRebalance(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2349,7 +2350,7 @@ public interface AuditLogger extends BasicLogger {
void isGroupRebalance(String user, Object source, Object... args);
static void getGroupBuckets(Object source) {
- LOGGER.getGroupBuckets(getCaller(), source);
+ BASE_LOGGER.getGroupBuckets(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2357,7 +2358,7 @@ public interface AuditLogger extends BasicLogger {
void getGroupBuckets(String user, Object source, Object... args);
static void getGroupFirstKey(Object source) {
- LOGGER.getGroupFirstKey(getCaller(), source);
+ BASE_LOGGER.getGroupFirstKey(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2365,7 +2366,7 @@ public interface AuditLogger extends BasicLogger {
void getGroupFirstKey(String user, Object source, Object... args);
static void getCurrentDuplicateIdCacheSize(Object source) {
- LOGGER.getCurrentDuplicateIdCacheSize(getCaller(), source);
+ BASE_LOGGER.getCurrentDuplicateIdCacheSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2374,7 +2375,7 @@ public interface AuditLogger extends BasicLogger {
static void clearDuplicateIdCache(Object source) {
- LOGGER.clearDuplicateIdCache(getCaller(), source);
+ BASE_LOGGER.clearDuplicateIdCache(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2383,7 +2384,7 @@ public interface AuditLogger extends BasicLogger {
static void getChannelName(Object source) {
- LOGGER.getChannelName(getCaller(), source);
+ BASE_LOGGER.getChannelName(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2391,7 +2392,7 @@ public interface AuditLogger extends BasicLogger {
void getChannelName(String user, Object source, Object... args);
static void getFileContents(Object source) {
- LOGGER.getFileContents(getCaller(), source);
+ BASE_LOGGER.getFileContents(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2399,7 +2400,7 @@ public interface AuditLogger extends BasicLogger {
void getFileContents(String user, Object source, Object... args);
static void getFile(Object source) {
- LOGGER.getFile(getCaller(), source);
+ BASE_LOGGER.getFile(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2407,7 +2408,7 @@ public interface AuditLogger extends BasicLogger {
void getFile(String user, Object source, Object... args);
static void getPreparedTransactionMessageCount(Object source) {
- LOGGER.getPreparedTransactionMessageCount(getCaller(), source);
+ BASE_LOGGER.getPreparedTransactionMessageCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2419,8 +2420,8 @@ public interface AuditLogger extends BasicLogger {
*
* */
//hot path log using a different logger
- static void coreSendMessage(String user, String messageToString, Object context) {
- MESSAGE_LOGGER.logCoreSendMessage(getCaller(user), messageToString, context);
+ static void coreSendMessage(Subject user, String remoteAddress, String messageToString, Object context) {
+ MESSAGE_LOGGER.logCoreSendMessage(getCaller(user, remoteAddress), messageToString, context);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2428,8 +2429,8 @@ public interface AuditLogger extends BasicLogger {
void logCoreSendMessage(String user, String messageToString, Object context);
//hot path log using a different logger
- static void coreConsumeMessage(Subject user, String queue, String message) {
- MESSAGE_LOGGER.consumeMessage(getCaller(user), queue, message);
+ static void coreConsumeMessage(Subject user, String remoteAddress, String queue, String message) {
+ MESSAGE_LOGGER.consumeMessage(getCaller(user, remoteAddress), queue, message);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2554,30 +2555,30 @@ public interface AuditLogger extends BasicLogger {
@Message(id = 601714, value = "User {0} failed to remove messages from Queue: {1}", format = Message.Format.MESSAGE_FORMAT)
void removeMessagesFailure(String user, String queue);
- static void userSuccesfullyLoggedInAudit(Subject subject) {
- RESOURCE_LOGGER.userSuccesfullyLoggedIn(getCaller(subject));
+ static void userSuccesfullyAuthenticatedInAudit(Subject subject, String remoteAddress) {
+ RESOURCE_LOGGER.userSuccesfullyAuthenticated(getCaller(subject, remoteAddress));
}
- static void userSuccesfullyLoggedInAudit() {
- RESOURCE_LOGGER.userSuccesfullyLoggedIn(getCaller());
+ static void userSuccesfullyAuthenticatedInAudit(Subject subject) {
+ userSuccesfullyAuthenticatedInAudit(subject, null);
}
@LogMessage(level = Logger.Level.INFO)
- @Message(id = 601715, value = "User {0} successfully authorized", format = Message.Format.MESSAGE_FORMAT)
- void userSuccesfullyLoggedIn(String caller);
+ @Message(id = 601715, value = "User {0} successfully authenticated", format = Message.Format.MESSAGE_FORMAT)
+ void userSuccesfullyAuthenticated(String caller);
- static void userFailedLoggedInAudit(String reason) {
- RESOURCE_LOGGER.userFailedLoggedIn(getCaller(), reason);
+ static void userFailedAuthenticationInAudit(String reason) {
+ RESOURCE_LOGGER.userFailedAuthentication(getCaller(), reason);
}
- static void userFailedLoggedInAudit(Subject subject, String reason) {
- RESOURCE_LOGGER.userFailedLoggedIn(getCaller(subject), reason);
+ static void userFailedAuthenticationInAudit(Subject subject, String reason) {
+ RESOURCE_LOGGER.userFailedAuthentication(getCaller(subject, null), reason);
}
@LogMessage(level = Logger.Level.INFO)
- @Message(id = 601716, value = "User {0} failed authorization, reason: {1}", format = Message.Format.MESSAGE_FORMAT)
- void userFailedLoggedIn(String user, String reason);
+ @Message(id = 601716, value = "User {0} failed authentication, reason: {1}", format = Message.Format.MESSAGE_FORMAT)
+ void userFailedAuthentication(String user, String reason);
static void objectInvokedSuccessfully(ObjectName objectName, String operationName) {
RESOURCE_LOGGER.objectInvokedSuccessfully(getCaller(), objectName, operationName);
@@ -2664,7 +2665,7 @@ public interface AuditLogger extends BasicLogger {
void browseMessagesFailure(String user, String queueName);
static void updateDivert(Object source, Object... args) {
- LOGGER.updateDivert(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.updateDivert(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -2672,7 +2673,7 @@ public interface AuditLogger extends BasicLogger {
void updateDivert(String user, Object source, Object... args);
static void isEnabled(Object source) {
- LOGGER.isEnabled(getCaller(), source);
+ BASE_LOGGER.isEnabled(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2680,7 +2681,7 @@ public interface AuditLogger extends BasicLogger {
void isEnabled(String user, Object source, Object... args);
static void disable(Object source, Object... args) {
- LOGGER.disable(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.disable(getCaller(), source, arrayToString(args));
}
@LogMessage(level = Logger.Level.INFO)
@@ -2688,7 +2689,7 @@ public interface AuditLogger extends BasicLogger {
void disable(String user, Object source, Object... args);
static void enable(Object source) {
- LOGGER.resume(getCaller(), source);
+ BASE_LOGGER.resume(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2731,7 +2732,7 @@ public interface AuditLogger extends BasicLogger {
void resumeAddressFailure(String user, String queueName);
static void isGroupRebalancePauseDispatch(Object source) {
- LOGGER.isGroupRebalancePauseDispatch(getCaller(), source);
+ BASE_LOGGER.isGroupRebalancePauseDispatch(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2739,7 +2740,7 @@ public interface AuditLogger extends BasicLogger {
void isGroupRebalancePauseDispatch(String user, Object source, Object... args);
static void getAuthenticationCacheSize(Object source) {
- LOGGER.getAuthenticationCacheSize(getCaller(), source);
+ BASE_LOGGER.getAuthenticationCacheSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2747,7 +2748,7 @@ public interface AuditLogger extends BasicLogger {
void getAuthenticationCacheSize(String user, Object source, Object... args);
static void getAuthorizationCacheSize(Object source) {
- LOGGER.getAuthorizationCacheSize(getCaller(), source);
+ BASE_LOGGER.getAuthorizationCacheSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2755,7 +2756,7 @@ public interface AuditLogger extends BasicLogger {
void getAuthorizationCacheSize(String user, Object source, Object... args);
static void listBrokerConnections() {
- LOGGER.listBrokerConnections(getCaller());
+ BASE_LOGGER.listBrokerConnections(getCaller());
}
@LogMessage(level = Logger.Level.INFO)
@@ -2763,7 +2764,7 @@ public interface AuditLogger extends BasicLogger {
void listBrokerConnections(String user);
static void stopBrokerConnection(String name) {
- LOGGER.stopBrokerConnection(getCaller(), name);
+ BASE_LOGGER.stopBrokerConnection(getCaller(), name);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2771,7 +2772,7 @@ public interface AuditLogger extends BasicLogger {
void stopBrokerConnection(String user, String name);
static void startBrokerConnection(String name) {
- LOGGER.startBrokerConnection(getCaller(), name);
+ BASE_LOGGER.startBrokerConnection(getCaller(), name);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2779,7 +2780,7 @@ public interface AuditLogger extends BasicLogger {
void startBrokerConnection(String user, String name);
static void getAddressCount(Object source) {
- LOGGER.getAddressCount(getCaller(), source);
+ BASE_LOGGER.getAddressCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2787,7 +2788,7 @@ public interface AuditLogger extends BasicLogger {
void getAddressCount(String user, Object source, Object... args);
static void getQueueCount(Object source) {
- LOGGER.getQueueCount(getCaller(), source);
+ BASE_LOGGER.getQueueCount(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2795,7 +2796,7 @@ public interface AuditLogger extends BasicLogger {
void getQueueCount(String user, Object source, Object... args);
static void lastValueKey(Object source) {
- LOGGER.lastValueKey(getCaller(), source);
+ BASE_LOGGER.lastValueKey(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2803,7 +2804,7 @@ public interface AuditLogger extends BasicLogger {
void lastValueKey(String user, Object source, Object... args);
static void consumersBeforeDispatch(Object source) {
- LOGGER.consumersBeforeDispatch(getCaller(), source);
+ BASE_LOGGER.consumersBeforeDispatch(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2811,7 +2812,7 @@ public interface AuditLogger extends BasicLogger {
void consumersBeforeDispatch(String user, Object source, Object... args);
static void delayBeforeDispatch(Object source) {
- LOGGER.delayBeforeDispatch(getCaller(), source);
+ BASE_LOGGER.delayBeforeDispatch(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2819,7 +2820,7 @@ public interface AuditLogger extends BasicLogger {
void delayBeforeDispatch(String user, Object source, Object... args);
static void isInternal(Object source) {
- LOGGER.isInternal(getCaller(), source);
+ BASE_LOGGER.isInternal(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@@ -2827,7 +2828,7 @@ public interface AuditLogger extends BasicLogger {
void isInternal(String user, Object source, Object... args);
static void isAutoCreated(Object source) {
- LOGGER.isAutoCreated(getCaller(), source);
+ BASE_LOGGER.isAutoCreated(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java
index ad5b81a..8dca528 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java
@@ -107,7 +107,7 @@ public abstract class AbstractControl extends StandardMBean {
@Override
public MBeanInfo getMBeanInfo() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMBeanInfo(this);
}
MBeanInfo info = super.getMBeanInfo();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
index c56e916..b319a1e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
@@ -53,7 +53,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont
@Override
public String getFactoryClassName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getFactoryClassName(this.acceptor);
}
clearIO();
@@ -66,7 +66,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont
@Override
public String getName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getName(this.acceptor);
}
clearIO();
@@ -79,7 +79,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont
@Override
public Map<String, Object> getParameters() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getParameters(this.acceptor);
}
clearIO();
@@ -98,7 +98,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont
@Override
public void reload() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.reload(this.acceptor);
}
clearIO();
@@ -111,7 +111,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont
@Override
public boolean isStarted() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isStarted(this.acceptor);
}
clearIO();
@@ -124,7 +124,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont
@Override
public void start() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.startAcceptor(this.acceptor);
}
clearIO();
@@ -137,7 +137,7 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont
@Override
public void stop() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.stopAcceptor(this.acceptor);
}
clearIO();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index 2003f10..28ea231 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -183,7 +183,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isStarted() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isStarted(this.server);
}
clearIO();
@@ -196,7 +196,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getVersion() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getVersion(this.server);
}
checkStarted();
@@ -211,7 +211,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isActive() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getVersion(this.server);
}
checkStarted();
@@ -226,7 +226,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isBackup() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isBackup(this.server);
}
checkStarted();
@@ -241,7 +241,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isSharedStore() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isSharedStore(this.server);
}
checkStarted();
@@ -256,7 +256,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getBindingsDirectory() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getBindingsDirectory(this.server);
}
checkStarted();
@@ -282,7 +282,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] getIncomingInterceptorClassNames() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getIncomingInterceptorClassNames(this.server);
}
checkStarted();
@@ -297,7 +297,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] getOutgoingInterceptorClassNames() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getOutgoingInterceptorClassNames(this.server);
}
checkStarted();
@@ -312,7 +312,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getJournalPoolFiles() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getJournalBufferSize(this.server);
}
checkStarted();
@@ -327,7 +327,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getJournalBufferSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getJournalBufferSize(this.server);
}
checkStarted();
@@ -342,7 +342,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getJournalBufferTimeout() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getJournalBufferTimeout(this.server);
}
checkStarted();
@@ -357,7 +357,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void setFailoverOnServerShutdown(boolean failoverOnServerShutdown) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.setFailoverOnServerShutdown(this.server, failoverOnServerShutdown);
}
checkStarted();
@@ -375,7 +375,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isFailoverOnServerShutdown() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isFailoverOnServerShutdown(this.server);
}
checkStarted();
@@ -395,7 +395,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getJournalMaxIO() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getJournalMaxIO(this.server);
}
checkStarted();
@@ -410,7 +410,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getJournalDirectory() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getJournalDirectory(this.server);
}
checkStarted();
@@ -425,7 +425,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getJournalFileSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getJournalFileSize(this.server);
}
checkStarted();
@@ -440,7 +440,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getJournalMinFiles() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getJournalMinFiles(this.server);
}
checkStarted();
@@ -455,7 +455,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getJournalCompactMinFiles() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getJournalCompactMinFiles(this.server);
}
checkStarted();
@@ -470,7 +470,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getJournalCompactPercentage() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getJournalCompactPercentage(this.server);
}
checkStarted();
@@ -485,7 +485,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isPersistenceEnabled() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isPersistenceEnabled(this.server);
}
checkStarted();
@@ -500,7 +500,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getJournalType() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getJournalType(this.server);
}
checkStarted();
@@ -515,7 +515,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getPagingDirectory() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getPagingDirectory(this.server);
}
checkStarted();
@@ -530,7 +530,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getScheduledThreadPoolMaxSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getScheduledThreadPoolMaxSize(this.server);
}
checkStarted();
@@ -545,7 +545,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getThreadPoolMaxSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getThreadPoolMaxSize(this.server);
}
checkStarted();
@@ -560,7 +560,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getSecurityInvalidationInterval() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getSecurityInvalidationInterval(this.server);
}
checkStarted();
@@ -575,7 +575,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isClustered() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isClustered(this.server);
}
checkStarted();
@@ -590,7 +590,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isCreateBindingsDir() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isCreateBindingsDir(this.server);
}
checkStarted();
@@ -605,7 +605,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isCreateJournalDir() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isCreateJournalDir(this.server);
}
checkStarted();
@@ -620,7 +620,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isJournalSyncNonTransactional() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isJournalSyncNonTransactional(this.server);
}
checkStarted();
@@ -635,7 +635,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isJournalSyncTransactional() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isJournalSyncTransactional(this.server);
}
checkStarted();
@@ -650,7 +650,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isSecurityEnabled() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isSecurityEnabled(this.server);
}
checkStarted();
@@ -665,7 +665,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isAsyncConnectionExecutionEnabled() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isAsyncConnectionExecutionEnabled(this.server);
}
checkStarted();
@@ -680,7 +680,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getDiskScanPeriod() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDiskScanPeriod(this.server);
}
checkStarted();
@@ -695,7 +695,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getMaxDiskUsage() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMaxDiskUsage(this.server);
}
checkStarted();
@@ -710,7 +710,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getGlobalMaxSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getGlobalMaxSize(this.server);
}
checkStarted();
@@ -725,7 +725,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getAddressMemoryUsage() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAddressMemoryUsage(this.server);
}
checkStarted();
@@ -743,7 +743,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public double getDiskStoreUsage() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDiskStoreUsage(this.server);
}
checkStarted();
@@ -757,7 +757,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getAddressMemoryUsagePercentage() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAddressMemoryUsagePercentage(this.server);
}
long globalMaxSize = getGlobalMaxSize();
@@ -781,7 +781,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getAuthenticationCacheSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAuthenticationCacheSize(this.server);
}
return ((SecurityStoreImpl)server.getSecurityStore()).getAuthenticationCacheSize();
@@ -789,7 +789,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getAuthorizationCacheSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAuthorizationCacheSize(this.server);
}
return ((SecurityStoreImpl)server.getSecurityStore()).getAuthorizationCacheSize();
@@ -797,7 +797,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean freezeReplication() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.freezeReplication(this.server);
}
Activation activation = server.getActivation();
@@ -966,7 +966,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
final String name,
final String filterStr,
final boolean durable) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.deployQueue(this.server, address, name, filterStr, durable);
}
checkStarted();
@@ -1201,8 +1201,8 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
long autoDeleteMessageCount,
boolean autoCreateAddress,
long ringSize) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.createQueue(this.server, null, address, routingType, name, filterStr, durable,
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.createQueue(this.server, null, null, address, routingType, name, filterStr, durable,
maxConsumers, purgeOnNoConsumers, exclusive, groupRebalance, groupBuckets, groupFirstKey,
lastValue, lastValueKey, nonDestructive, consumersBeforeDispatch, delayBeforeDispatch,
autoDelete, autoDeleteDelay, autoDeleteMessageCount, autoCreateAddress, ringSize);
@@ -1259,8 +1259,8 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String createQueue(String queueConfigurationAsJson, boolean ignoreIfExists) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.createQueue(this.server, null, queueConfigurationAsJson, ignoreIfExists);
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.createQueue(this.server, null, null, queueConfigurationAsJson, ignoreIfExists);
}
checkStarted();
@@ -1284,7 +1284,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String updateQueue(String queueConfigurationAsJson) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.updateQueue(this.server, queueConfigurationAsJson);
}
checkStarted();
@@ -1383,7 +1383,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
Long delayBeforeDispatch,
String user,
Long ringSize) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.updateQueue(this.server, name, routingType, filter, maxConsumers, purgeOnNoConsumers,
exclusive, groupRebalance, groupBuckets, groupFirstKey, nonDestructive, consumersBeforeDispatch, delayBeforeDispatch, user, ringSize);
}
@@ -1411,7 +1411,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getQueueCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getQueueCount(this.server);
}
checkStarted();
@@ -1432,7 +1432,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] getQueueNames(String routingType) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getQueueNames(this.server, routingType);
}
checkStarted();
@@ -1459,7 +1459,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] getClusterConnectionNames() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getClusterConnectionNames(this.server);
}
checkStarted();
@@ -1480,7 +1480,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getUptime() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getUptime(this.server);
}
checkStarted();
@@ -1495,7 +1495,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getUptimeMillis() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getUptimeMillis(this.server);
}
checkStarted();
@@ -1510,7 +1510,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isReplicaSync() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isReplicaSync(this.server);
}
checkStarted();
@@ -1525,7 +1525,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getAddressCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAddressCount(this.server);
}
checkStarted();
@@ -1541,7 +1541,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] getAddressNames() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAddressNames(this.server);
}
checkStarted();
@@ -1562,8 +1562,8 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void destroyQueue(final String name, final boolean removeConsumers, final boolean autoDeleteAddress) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.destroyQueue(this.server, null, name, removeConsumers, autoDeleteAddress);
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.destroyQueue(this.server, null, null, name, removeConsumers, autoDeleteAddress);
}
checkStarted();
@@ -1598,7 +1598,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getAddressInfo(String address) throws ActiveMQAddressDoesNotExistException {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAddressInfo(this.server, address);
}
checkStarted();
@@ -1618,7 +1618,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listBindingsForAddress(String address) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listBindingsForAddress(this.server, address);
}
checkStarted();
@@ -1635,7 +1635,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listAddresses(String separator) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listAddresses(this.server, separator);
}
checkStarted();
@@ -1668,7 +1668,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getConnectionCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getConnectionCount(this.server);
}
checkStarted();
@@ -1683,7 +1683,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getTotalConnectionCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTotalConnectionCount(this.server);
}
checkStarted();
@@ -1698,7 +1698,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getTotalMessageCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTotalMessageCount(this.server);
}
checkStarted();
@@ -1713,7 +1713,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getTotalMessagesAdded() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTotalMessagesAdded(this.server);
}
checkStarted();
@@ -1728,7 +1728,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getTotalMessagesAcknowledged() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTotalMessagesAcknowledged(this.server);
}
checkStarted();
@@ -1743,7 +1743,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getTotalConsumerCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTotalConsumerCount(this.server);
}
checkStarted();
@@ -1758,7 +1758,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void enableMessageCounters() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.enableMessageCounters(this.server);
}
checkStarted();
@@ -1773,7 +1773,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void disableMessageCounters() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.disableMessageCounters(this.server);
}
checkStarted();
@@ -1788,7 +1788,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void resetAllMessageCounters() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resetAllMessageCounters(this.server);
}
checkStarted();
@@ -1803,7 +1803,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void resetAllMessageCounterHistories() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resetAllMessageCounterHistories(this.server);
}
checkStarted();
@@ -1818,7 +1818,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isMessageCounterEnabled() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isMessageCounterEnabled(this.server);
}
checkStarted();
@@ -1833,7 +1833,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public synchronized long getMessageCounterSamplePeriod() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessageCounterSamplePeriod(this.server);
}
checkStarted();
@@ -1848,7 +1848,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public synchronized void setMessageCounterSamplePeriod(final long newPeriod) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.setMessageCounterSamplePeriod(this.server, newPeriod);
}
@@ -1873,7 +1873,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getMessageCounterMaxDayCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessageCounterMaxDayCount(this.server);
}
checkStarted();
@@ -1888,7 +1888,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void setMessageCounterMaxDayCount(final int count) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.setMessageCounterMaxDayCount(this.server, count);
}
checkStarted();
@@ -1906,7 +1906,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] listPreparedTransactions() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listPreparedTransactions(this.server);
}
checkStarted();
@@ -1943,7 +1943,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
}
public String listPreparedTransactionDetailsAsJSON(TransactionDetailFactory factory) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listPreparedTransactionDetailsAsJSON(this.server);
}
checkStarted();
@@ -1990,7 +1990,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
}
public String listPreparedTransactionDetailsAsHTML(TransactionDetailFactory factory) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listPreparedTransactionDetailsAsHTML(this.server, factory);
}
checkStarted();
@@ -2075,7 +2075,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] listHeuristicCommittedTransactions() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listHeuristicCommittedTransactions(this.server);
}
checkStarted();
@@ -2096,7 +2096,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] listHeuristicRolledBackTransactions() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listHeuristicRolledBackTransactions(this.server);
}
checkStarted();
@@ -2117,7 +2117,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public synchronized boolean commitPreparedTransaction(final String transactionAsBase64) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.commitPreparedTransaction(this.server, transactionAsBase64);
}
checkStarted();
@@ -2144,7 +2144,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public synchronized boolean rollbackPreparedTransaction(final String transactionAsBase64) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.rollbackPreparedTransaction(this.server, transactionAsBase64);
}
checkStarted();
@@ -2172,7 +2172,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] listRemoteAddresses() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listRemoteAddresses(this.server);
}
checkStarted();
@@ -2195,7 +2195,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] listRemoteAddresses(final String ipAddress) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listRemoteAddresses(this.server, ipAddress);
}
checkStarted();
@@ -2219,7 +2219,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean closeConnectionsForAddress(final String ipAddress) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.closeConnectionsForAddress(this.server, ipAddress);
}
checkStarted();
@@ -2246,7 +2246,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean closeConsumerConnectionsForAddress(final String address) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.closeConsumerConnectionsForAddress(this.server, address);
}
boolean closed = false;
@@ -2287,7 +2287,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean closeConnectionsForUser(final String userName) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.closeConnectionsForUser(this.server, userName);
}
boolean closed = false;
@@ -2320,7 +2320,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean closeConnectionWithID(final String ID) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.closeConnectionWithID(this.server, ID);
}
checkStarted();
@@ -2342,7 +2342,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean closeSessionWithID(final String connectionID, final String ID) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.closeSessionWithID(this.server, connectionID, ID);
}
checkStarted();
@@ -2365,7 +2365,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean closeConsumerWithID(final String sessionID, final String ID) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.closeConsumerWithID(this.server, sessionID, ID);
}
checkStarted();
@@ -2393,7 +2393,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] listConnectionIDs() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listConnectionIDs(this.server);
}
checkStarted();
@@ -2414,7 +2414,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] listSessions(final String connectionID) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listSessions(this.server, connectionID);
}
checkStarted();
@@ -2438,7 +2438,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
*/
@Override
public String listProducersInfoAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listProducersInfoAsJSON(this.server);
}
JsonArrayBuilder producers = JsonLoader.createArrayBuilder();
@@ -2452,7 +2452,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listConnections(String options, int page, int pageSize) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listConnections(this.server, options, page, pageSize);
}
checkStarted();
@@ -2470,7 +2470,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listSessions(String options, int page, int pageSize) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listSessions(this.server, options, page, pageSize);
}
checkStarted();
@@ -2487,7 +2487,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listConsumers(String options, int page, int pageSize) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listConsumers(this.server, options, page, pageSize);
}
checkStarted();
@@ -2508,7 +2508,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listAddresses(String options, int page, int pageSize) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listAddresses(this.server, options, page, pageSize);
}
checkStarted();
@@ -2534,7 +2534,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listQueues(String options, int page, int pageSize) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listQueues(this.server, options, page, pageSize);
}
checkStarted();
@@ -2559,7 +2559,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
public String listProducers(@Parameter(name = "Options") String options,
@Parameter(name = "Page Number") int page,
@Parameter(name = "Page Size") int pageSize) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listProducers(this.server, options, page, pageSize);
}
checkStarted();
@@ -2580,7 +2580,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listConnectionsAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listConnectionsAsJSON(this.server);
}
checkStarted();
@@ -2604,7 +2604,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listSessionsAsJSON(final String connectionID) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listSessionsAsJSON(this.server, connectionID);
}
checkStarted();
@@ -2625,7 +2625,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listAllSessionsAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listAllSessionsAsJSON(this.server);
}
checkStarted();
@@ -2664,7 +2664,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listConsumersAsJSON(String connectionID) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listConsumersAsJSON(this.server, connectionID);
}
checkStarted();
@@ -2697,7 +2697,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listAllConsumersAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listAllConsumersAsJSON(this.server);
}
checkStarted();
@@ -2734,7 +2734,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public Object[] getConnectors() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getConnectors(this.server);
}
checkStarted();
@@ -2763,7 +2763,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getConnectorsAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getConnectorsAsJSON(this.server);
}
checkStarted();
@@ -2819,7 +2819,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
final String browseRoles,
final String createAddressRoles,
final String deleteAddressRoles) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.addSecuritySettings(this.server, addressMatch, sendRoles, consumeRoles, createDurableQueueRoles,
deleteDurableQueueRoles, createNonDurableQueueRoles, deleteNonDurableQueueRoles, manageRoles,
browseRoles, createAddressRoles, deleteAddressRoles);
@@ -2842,7 +2842,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void removeSecuritySettings(final String addressMatch) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.removeSecuritySettings(this.server, addressMatch);
}
checkStarted();
@@ -2858,7 +2858,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public Object[] getRoles(final String addressMatch) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRoles(this.server, addressMatch);
}
@@ -2882,7 +2882,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getRolesAsJSON(final String addressMatch) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRolesAsJSON(this.server, addressMatch);
}
checkStarted();
@@ -2903,7 +2903,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getAddressSettingsAsJSON(final String address) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAddressSettingsAsJSON(this.server, address);
}
checkStarted();
@@ -3391,7 +3391,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
final long minExpiryDelay,
final long maxExpiryDelay,
final boolean enableMetrics) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.addAddressSettings(this.server, address, DLA, expiryAddress, expiryDelay, defaultLastValueQueue, maxDeliveryAttempts,
maxSizeBytes, pageSizeBytes, pageMaxCacheSize, redeliveryDelay, redeliveryMultiplier,
maxRedeliveryDelay, redistributionDelay, sendToDLAOnNoRoute, addressFullMessagePolicy,
@@ -3484,7 +3484,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void removeAddressSettings(final String addressMatch) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.removeAddressSettings(this.server, addressMatch);
}
checkStarted();
@@ -3513,7 +3513,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] getDivertNames() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDivertNames(this.server);
}
checkStarted();
@@ -3579,7 +3579,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
final String transformerClassName,
final Map<String, String> transformerProperties,
final String routingType) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.createDivert(this.server, name, routingName, address, forwardingAddress,
exclusive, filterString, transformerClassName, transformerProperties, routingType);
}
@@ -3602,7 +3602,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
final String transformerClassName,
final Map<String, String> transformerProperties,
final String routingType) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.updateDivert(this.server, name, forwardingAddress, filterString,
transformerClassName, transformerProperties, routingType);
}
@@ -3629,7 +3629,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void destroyDivert(final String name) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.destroyDivert(this.server, name);
}
checkStarted();
@@ -3644,7 +3644,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] getBridgeNames() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getBridgeNames(this.server);
}
checkStarted();
@@ -3765,7 +3765,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
final boolean ha,
final String user,
final String password) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.createBridge(this.server, name, queueName, forwardingAddress, filterString,
transformerClassName, transformerProperties, retryInterval, retryIntervalMultiplier,
initialConnectAttempts, reconnectAttempts, useDuplicateDetection, confirmationWindowSize,
@@ -3810,7 +3810,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
final boolean ha,
final String user,
final String password) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.createBridge(this.server, name, queueName, forwardingAddress, filterString,
transformerClassName, retryInterval, retryIntervalMultiplier, initialConnectAttempts,
reconnectAttempts, useDuplicateDetection, confirmationWindowSize, clientFailureCheckPeriod,
@@ -3838,7 +3838,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void createBridge(String bridgeConfigurationAsJson) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.createBridge(this.server, bridgeConfigurationAsJson);
}
checkStarted();
@@ -3861,7 +3861,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listBrokerConnections() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listBrokerConnections();
}
checkStarted();
@@ -3885,7 +3885,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void startBrokerConnection(String name) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.startBrokerConnection(name);
}
checkStarted();
@@ -3900,7 +3900,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void stopBrokerConnection(String name) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.stopBrokerConnection(name);
}
checkStarted();
@@ -3915,7 +3915,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void destroyBridge(final String name) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.destroyBridge(this.server, name);
}
checkStarted();
@@ -3930,7 +3930,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void createConnectorService(final String name, final String factoryClass, final Map<String, Object> parameters) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.createConnectorService(this.server, name, factoryClass, parameters);
}
checkStarted();
@@ -3948,7 +3948,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void destroyConnectorService(final String name) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.destroyConnectorService(this.server, name);
}
checkStarted();
@@ -3964,7 +3964,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String[] getConnectorServices() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getConnectorServices(this.server);
}
checkStarted();
@@ -3980,7 +3980,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void forceFailover() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.forceFailover(this.server);
}
checkStarted();
@@ -4014,7 +4014,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void scaleDown(String connector) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.scaleDown(this.server, connector);
}
checkStarted();
@@ -4041,7 +4041,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listNetworkTopology() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listNetworkTopology(this.server);
}
checkStarted();
@@ -4083,7 +4083,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
public void removeNotificationListener(final NotificationListener listener,
final NotificationFilter filter,
final Object handback) throws ListenerNotFoundException {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.removeNotificationListener(this.server, listener, filter, handback);
}
clearIO();
@@ -4096,7 +4096,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void removeNotificationListener(final NotificationListener listener) throws ListenerNotFoundException {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.removeNotificationListener(this.server, listener);
}
clearIO();
@@ -4111,7 +4111,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
public void addNotificationListener(final NotificationListener listener,
final NotificationFilter filter,
final Object handback) throws IllegalArgumentException {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.addNotificationListener(this.server, listener, filter, handback);
}
clearIO();
@@ -4124,7 +4124,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public MBeanNotificationInfo[] getNotificationInfo() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getNotificationInfo(this.server);
}
CoreNotificationType[] values = CoreNotificationType.values();
@@ -4166,7 +4166,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getConnectionTTLOverride() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getConnectionTTLOverride(this.server);
}
return configuration.getConnectionTTLOverride();
@@ -4174,7 +4174,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public int getIDCacheSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getIDCacheSize(this.server);
}
return configuration.getIDCacheSize();
@@ -4182,7 +4182,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getLargeMessagesDirectory() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getLargeMessagesDirectory(this.server);
}
return configuration.getLargeMessagesDirectory();
@@ -4190,7 +4190,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getManagementAddress() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getManagementAddress(this.server);
}
return configuration.getManagementAddress().toString();
@@ -4198,7 +4198,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getNodeID() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getNodeID(this.server);
}
return server.getNodeID() == null ? null : server.getNodeID().toString();
@@ -4206,7 +4206,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getManagementNotificationAddress() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getManagementNotificationAddress(this.server);
}
return configuration.getManagementNotificationAddress().toString();
@@ -4214,7 +4214,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getMessageExpiryScanPeriod() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessageExpiryScanPeriod(this.server);
}
return configuration.getMessageExpiryScanPeriod();
@@ -4223,7 +4223,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
@Deprecated
public long getMessageExpiryThreadPriority() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessageExpiryThreadPriority(this.server);
}
return configuration.getMessageExpiryThreadPriority();
@@ -4231,7 +4231,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getTransactionTimeout() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTransactionTimeout(this.server);
}
return configuration.getTransactionTimeout();
@@ -4239,7 +4239,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public long getTransactionTimeoutScanPeriod() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTransactionTimeoutScanPeriod(this.server);
}
return configuration.getTransactionTimeoutScanPeriod();
@@ -4247,7 +4247,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isPersistDeliveryCountBeforeDelivery() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isPersistDeliveryCountBeforeDelivery(this.server);
}
return configuration.isPersistDeliveryCountBeforeDelivery();
@@ -4255,7 +4255,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isPersistIDCache() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isPersistIDCache(this.server);
}
return configuration.isPersistIDCache();
@@ -4263,7 +4263,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public boolean isWildcardRoutingEnabled() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isWildcardRoutingEnabled(this.server);
}
return configuration.isWildcardRoutingEnabled();
@@ -4314,7 +4314,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void addUser(String username, String password, String roles, boolean plaintext) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.addUser(this.server, username, "****", roles, plaintext);
}
@@ -4339,7 +4339,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String listUser(String username) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listUser(this.server, username);
}
if (server.getSecurityManager() instanceof ActiveMQBasicSecurityManager) {
@@ -4370,7 +4370,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void removeUser(String username) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.removeUser(this.server, username);
}
if (server.getSecurityManager() instanceof ActiveMQBasicSecurityManager) {
@@ -4388,7 +4388,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void resetUser(String username, String password, String roles, boolean plaintext) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resetUser(this.server, username, "****", roles, plaintext);
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
index 1b4ad6f..02601a9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
@@ -99,7 +99,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public String[] getRoutingTypes() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRoutingTypes(this.addressInfo);
}
EnumSet<RoutingType> routingTypes = addressInfo.getRoutingTypes();
@@ -113,7 +113,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public String getRoutingTypesAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRoutingTypesAsJSON(this.addressInfo);
}
@@ -151,7 +151,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
}
private String[] getQueueNames(SearchType searchType) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getQueueNames(this.addressInfo, searchType);
}
clearIO();
@@ -177,7 +177,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public String[] getBindingNames() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getBindingNames(this.addressInfo);
}
try {
@@ -203,7 +203,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public Object[] getRoles() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRoles(this.addressInfo);
}
clearIO();
@@ -224,7 +224,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public String getRolesAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRolesAsJSON(this.addressInfo);
}
clearIO();
@@ -243,7 +243,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public long getNumberOfBytesPerPage() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getNumberOfBytesPerPage(this.addressInfo);
}
clearIO();
@@ -264,7 +264,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public long getAddressSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAddressSize(this.addressInfo);
}
clearIO();
@@ -284,7 +284,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public long getNumberOfMessages() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getNumberOfMessages(this.addressInfo);
}
clearIO();
@@ -308,7 +308,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public boolean isPaging() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isPaging(this.addressInfo);
}
clearIO();
@@ -325,7 +325,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public int getNumberOfPages() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getNumberOfPages(this.addressInfo);
}
clearIO();
@@ -347,7 +347,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public long getMessageCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessageCount(this.addressInfo);
}
return getMessageCount(DurabilityType.ALL);
@@ -355,7 +355,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public long getRoutedMessageCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRoutedMessageCount(this.addressInfo);
}
return addressInfo.getRoutedMessageCount();
@@ -363,7 +363,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public long getUnRoutedMessageCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getUnRoutedMessageCount(this.addressInfo);
}
return addressInfo.getUnRoutedMessageCount();
@@ -377,8 +377,8 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
boolean durable,
final String user,
final String password) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.sendMessage(this, null, headers, type, body, durable, user, "****");
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.sendMessageThroughManagement(this, headers, type, body, durable, user, "****");
}
try {
return sendMessage(addressInfo.getName(), server, headers, type, body, durable, user, password);
@@ -406,7 +406,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public void pause(boolean persist) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.pause(addressInfo);
}
checkStarted();
@@ -432,7 +432,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public void resume() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resume(addressInfo);
}
checkStarted();
@@ -457,7 +457,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public boolean isPaused() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isPaused(this.addressInfo);
}
return addressInfo.isPaused();
@@ -465,7 +465,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public boolean isRetroactiveResource() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isRetroactiveResource(this.addressInfo);
}
return ResourceNames.isRetroactiveResource(server.getInternalNamingPrefix(), addressInfo.getName());
@@ -473,7 +473,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public long getCurrentDuplicateIdCacheSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getCurrentDuplicateIdCacheSize(this.addressInfo);
}
DuplicateIDCache cache = ((PostOfficeImpl)server.getPostOffice()).getDuplicateIDCaches().get(addressInfo.getName());
@@ -490,7 +490,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public boolean clearDuplicateIdCache() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.clearDuplicateIdCache(this.addressInfo);
}
DuplicateIDCache cache = ((PostOfficeImpl)server.getPostOffice()).getDuplicateIDCaches().get(addressInfo.getName());
@@ -508,7 +508,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public boolean isAutoCreated() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isAutoCreated(this.addressInfo);
}
return addressInfo.isAutoCreated();
@@ -516,7 +516,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public boolean isInternal() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isInternal(this.addressInfo);
}
return addressInfo.isInternal();
@@ -524,7 +524,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
@Override
public boolean isTemporary() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isTemporary(this.addressInfo);
}
return addressInfo.isTemporary();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java
index f7e3b5a..efcd5b0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java
@@ -62,7 +62,7 @@ public class BaseBroadcastGroupControlImpl extends AbstractControl implements Ba
@Override
public String getName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getName(this.broadcastGroup);
}
clearIO();
@@ -75,7 +75,7 @@ public class BaseBroadcastGroupControlImpl extends AbstractControl implements Ba
@Override
public long getBroadcastPeriod() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getBroadcastPeriod(this.broadcastGroup);
}
clearIO();
@@ -88,7 +88,7 @@ public class BaseBroadcastGroupControlImpl extends AbstractControl implements Ba
@Override
public Object[] getConnectorPairs() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getConnectorPairs(this.broadcastGroup);
}
clearIO();
@@ -107,7 +107,7 @@ public class BaseBroadcastGroupControlImpl extends AbstractControl implements Ba
@Override
public String getConnectorPairsAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getConnectorPairsAsJSON(this.broadcastGroup);
}
clearIO();
@@ -122,7 +122,7 @@ public class BaseBroadcastGroupControlImpl extends AbstractControl implements Ba
@Override
public boolean isStarted() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isStarted(this.broadcastGroup);
}
clearIO();
@@ -135,7 +135,7 @@ public class BaseBroadcastGroupControlImpl extends AbstractControl implements Ba
@Override
public void start() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.startBroadcastGroup(this.broadcastGroup);
}
clearIO();
@@ -148,7 +148,7 @@ public class BaseBroadcastGroupControlImpl extends AbstractControl implements Ba
@Override
public void stop() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.stopBroadcastGroup(this.broadcastGroup);
}
clearIO();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java
index 56ff65b..b062246 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java
@@ -55,7 +55,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public String[] getStaticConnectors() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getStaticConnectors(this.bridge);
}
clearIO();
@@ -69,7 +69,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public String getForwardingAddress() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getForwardingAddress(this.bridge);
}
clearIO();
@@ -82,7 +82,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public String getQueueName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getQueueName(this.bridge);
}
clearIO();
@@ -95,7 +95,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public String getDiscoveryGroupName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDiscoveryGroupName(this.bridge);
}
clearIO();
@@ -108,7 +108,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public String getFilterString() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getFilterString(this.bridge);
}
clearIO();
@@ -121,7 +121,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public int getReconnectAttempts() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getReconnectAttempts(this.bridge);
}
clearIO();
@@ -134,7 +134,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public String getName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getName(this.bridge);
}
clearIO();
@@ -147,7 +147,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public long getRetryInterval() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRetryInterval(this.bridge);
}
clearIO();
@@ -160,7 +160,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public double getRetryIntervalMultiplier() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRetryIntervalMultiplier(this.bridge);
}
clearIO();
@@ -173,7 +173,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public String getTransformerClassName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTransformerClassName(this.bridge);
}
clearIO();
@@ -186,7 +186,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public String getTransformerPropertiesAsJSON() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTransformerPropertiesAsJSON(this.bridge);
}
return JsonUtil.toJsonObject(getTransformerProperties()).toString();
@@ -194,7 +194,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public Map<String, String> getTransformerProperties() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTransformerProperties(this.bridge);
}
clearIO();
@@ -207,7 +207,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public boolean isStarted() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isStartedBridge(this.bridge);
}
clearIO();
@@ -220,7 +220,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public boolean isUseDuplicateDetection() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isUseDuplicateDetection(this.bridge);
}
clearIO();
@@ -233,7 +233,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public boolean isHA() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isHA(this.bridge);
}
clearIO();
@@ -246,7 +246,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public void start() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.startBridge(this.bridge);
}
clearIO();
@@ -259,7 +259,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public void stop() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.stopBridge(this.bridge);
}
clearIO();
@@ -283,7 +283,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public long getMessagesPendingAcknowledgement() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessagesPendingAcknowledgement(this.bridge);
}
clearIO();
@@ -296,7 +296,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public long getMessagesAcknowledged() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessagesAcknowledged(this.bridge);
}
clearIO();
@@ -309,7 +309,7 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
@Override
public Map<String, Object> getMetrics() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMetrics(this.bridge);
}
clearIO();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java
index 6d4dcc7..bf50b84 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java
@@ -48,7 +48,7 @@ public class BroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl imp
//todo ghoward we should deal with this properly
@Override
public String getGroupAddress() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getGroupAddress(this.getBroadcastGroup());
}
clearIO();
@@ -61,7 +61,7 @@ public class BroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl imp
@Override
public int getGroupPort() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getGroupPort(this.getBroadcastGroup());
}
clearIO();
@@ -74,7 +74,7 @@ public class BroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl imp
@Override
public int getLocalBindPort() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getLocalBindPort(this.getBroadcastGroup());
}
clearIO();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java
index 0d9668c..ccdd64a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java
@@ -56,7 +56,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public String getAddress() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAddress(this.clusterConnection);
}
clearIO();
@@ -70,7 +70,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public String getDiscoveryGroupName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDiscoveryGroupName(this.clusterConnection);
}
clearIO();
@@ -84,7 +84,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public int getMaxHops() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMaxHops(this.clusterConnection);
}
clearIO();
@@ -98,7 +98,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public String getName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getName(this.clusterConnection);
}
clearIO();
@@ -112,7 +112,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public long getRetryInterval() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRetryInterval(this.clusterConnection);
}
clearIO();
@@ -126,7 +126,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public String getNodeID() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getNodeID(this.clusterConnection);
}
clearIO();
@@ -139,7 +139,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public String[] getStaticConnectors() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getStaticConnectors(this.clusterConnection);
}
clearIO();
@@ -157,7 +157,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public String getStaticConnectorsAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getStaticConnectorsAsJSON(this.clusterConnection);
}
clearIO();
@@ -170,7 +170,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public boolean isDuplicateDetection() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isDuplicateDetection(this.clusterConnection);
}
clearIO();
@@ -183,7 +183,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public String getMessageLoadBalancingType() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessageLoadBalancingType(this.clusterConnection);
}
clearIO();
@@ -196,7 +196,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public String getTopology() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTopology(this.clusterConnection);
}
clearIO();
@@ -209,7 +209,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public Map<String, String> getNodes() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getNodes(this.clusterConnection);
}
clearIO();
@@ -222,7 +222,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public boolean isStarted() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isStarted(this.clusterConnection);
}
clearIO();
@@ -235,7 +235,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public void start() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.startClusterConnection(this.clusterConnection);
}
clearIO();
@@ -249,7 +249,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public void stop() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.stopClusterConnection(this.clusterConnection);
}
clearIO();
@@ -273,7 +273,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public long getMessagesPendingAcknowledgement() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessagesPendingAcknowledgement(this.clusterConnection);
}
clearIO();
@@ -286,7 +286,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public long getMessagesAcknowledged() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessagesAcknowledged(this.clusterConnection);
}
clearIO();
@@ -299,7 +299,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public Map<String, Object> getMetrics() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMetrics(this.clusterConnection);
}
clearIO();
@@ -312,7 +312,7 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
@Override
public Map<String, Object> getBridgeMetrics(String nodeId) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getBridgeMetrics(this.clusterConnection, nodeId);
}
clearIO();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java
index 5ede913..946b03c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java
@@ -58,7 +58,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public String getAddress() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAddress(this.divert);
}
clearIO();
@@ -71,7 +71,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public String getFilter() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getFilter(this.divert);
}
clearIO();
@@ -85,7 +85,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public String getForwardingAddress() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getForwardingAddress(this.divert);
}
clearIO();
@@ -98,7 +98,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public String getRoutingName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRoutingName(this.divert);
}
clearIO();
@@ -111,7 +111,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public String getTransformerClassName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTransformerClassName(this.divert);
}
clearIO();
@@ -126,7 +126,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public String getTransformerPropertiesAsJSON() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTransformerPropertiesAsJSON(this.divert);
}
return JsonUtil.toJsonObject(getTransformerProperties()).toString();
@@ -134,7 +134,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public Map<String, String> getTransformerProperties() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getTransformerProperties(this.divert);
}
clearIO();
@@ -149,7 +149,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public String getRoutingType() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRoutingType(this.divert);
}
clearIO();
@@ -162,7 +162,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public String getUniqueName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getUniqueName(this.divert);
}
clearIO();
@@ -175,7 +175,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public boolean isExclusive() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isExclusive(this.divert);
}
clearIO();
@@ -188,7 +188,7 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
@Override
public boolean isRetroactiveResource() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isRetroactiveResource(this.divert);
}
return ResourceNames.isRetroactiveResource(internalNamingPrefix, divert.getUniqueName());
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java
index bda1c22..2f92c32 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java
@@ -47,7 +47,7 @@ public class JGroupsChannelBroadcastGroupControlImpl extends BaseBroadcastGroupC
@Override
public String getChannelName() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getChannelName(this.endpointFactory.getChannelName());
}
return endpointFactory.getChannelName();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java
index 9f6d1ef..81112b5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java
@@ -52,7 +52,7 @@ public class JGroupsFileBroadcastGroupControlImpl extends BaseBroadcastGroupCont
@Override
public String getFileContents() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getFileContents(this.getBroadcastGroup());
}
URL resource = this.getClass().getClassLoader().getResource(this.getFile());
@@ -62,7 +62,7 @@ public class JGroupsFileBroadcastGroupControlImpl extends BaseBroadcastGroupCont
@Override
public String getChannelName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getChannelName(this.getBroadcastGroup());
}
return endpointFactory.getChannelName();
@@ -70,7 +70,7 @@ public class JGroupsFileBroadcastGroupControlImpl extends BaseBroadcastGroupCont
@Override
public String getFile() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getFile(this.getBroadcastGroup());
}
return endpointFactory.getFile();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java
index 40d6ea2..7ef7047 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java
@@ -47,7 +47,7 @@ public class JGroupsPropertiesBroadcastGroupControlImpl extends BaseBroadcastGro
@Override
public String getChannelName() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getChannelName(this.endpointFactory.getChannelName());
}
return endpointFactory.getChannelName();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index 61b76fe..4ecdeea 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -136,7 +136,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String getName() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getName(queue);
}
clearIO();
@@ -149,7 +149,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String getAddress() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getAddress(queue);
}
@@ -160,7 +160,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String getFilter() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getFilter(queue);
}
@@ -179,7 +179,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isDurable() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isDurable(queue);
}
checkStarted();
@@ -194,7 +194,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String getUser() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getUser(queue);
}
checkStarted();
@@ -211,7 +211,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String getRoutingType() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRoutingType(queue);
}
checkStarted();
@@ -227,7 +227,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isTemporary() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isTemporary(queue);
}
checkStarted();
@@ -242,7 +242,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isRetroactiveResource() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isRetroactiveResource(queue);
}
checkStarted();
@@ -257,7 +257,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getMessageCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessageCount(queue);
}
checkStarted();
@@ -272,7 +272,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getPersistentSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getPersistentSize(queue);
}
@@ -288,7 +288,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getDurableMessageCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDurableMessageCount(queue);
}
checkStarted();
@@ -303,7 +303,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getDurablePersistentSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDurablePersistSize(queue);
}
checkStarted();
@@ -318,7 +318,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int getConsumerCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getConsumerCount(queue);
}
checkStarted();
@@ -333,7 +333,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int getDeliveringCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDeliveringCount(queue);
}
checkStarted();
@@ -348,7 +348,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getDeliveringSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDeliveringSize(queue);
}
checkStarted();
@@ -363,7 +363,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int getDurableDeliveringCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDurableDeliveringCount(queue);
}
checkStarted();
@@ -378,7 +378,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getDurableDeliveringSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDurableDeliveringSize(queue);
}
checkStarted();
@@ -393,7 +393,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getMessagesAdded() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessagesAdded(queue);
}
checkStarted();
@@ -408,7 +408,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getMessagesAcknowledged() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessagesAcknowledged(queue);
}
checkStarted();
@@ -423,7 +423,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getAcknowledgeAttempts() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessagesAcknowledged(queue);
}
checkStarted();
@@ -438,7 +438,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getMessagesExpired() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessagesExpired(queue);
}
checkStarted();
@@ -453,7 +453,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getMessagesKilled() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMessagesKilled(queue);
}
checkStarted();
@@ -468,7 +468,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getID() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getID(queue);
}
checkStarted();
@@ -483,7 +483,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getScheduledCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getScheduledCount(queue);
}
checkStarted();
@@ -498,7 +498,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getScheduledSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getScheduledSize(queue);
}
checkStarted();
@@ -513,7 +513,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getDurableScheduledCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDurableScheduledCount(queue);
}
checkStarted();
@@ -528,7 +528,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getDurableScheduledSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDurableScheduledSize(queue);
}
checkStarted();
@@ -543,7 +543,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String getDeadLetterAddress() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getDeadLetterAddress(queue);
}
checkStarted();
@@ -563,7 +563,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String getExpiryAddress() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getExpiryAddress(queue);
}
checkStarted();
@@ -584,7 +584,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int getMaxConsumers() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getMaxConsumers(queue);
}
checkStarted();
@@ -599,7 +599,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isPurgeOnNoConsumers() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isPurgeOnNoConsumers(queue);
}
checkStarted();
@@ -614,7 +614,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void disable() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.disable(queue);
}
checkStarted();
@@ -629,7 +629,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void enable() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.enable(queue);
}
checkStarted();
@@ -644,7 +644,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isEnabled() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isEnabled(queue);
}
checkStarted();
@@ -660,7 +660,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isConfigurationManaged() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isConfigurationManaged(queue);
}
checkStarted();
@@ -675,7 +675,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isExclusive() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isExclusive(queue);
}
checkStarted();
@@ -690,7 +690,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isLastValue() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isLastValue(queue);
}
checkStarted();
@@ -705,7 +705,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String getLastValueKey() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.lastValueKey(queue);
}
checkStarted();
@@ -724,7 +724,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int getConsumersBeforeDispatch() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.consumersBeforeDispatch(queue);
}
checkStarted();
@@ -739,7 +739,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getDelayBeforeDispatch() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.delayBeforeDispatch(queue);
}
checkStarted();
@@ -754,7 +754,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public Map<String, Object>[] listScheduledMessages() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listScheduledMessages(queue);
}
checkStarted();
@@ -770,7 +770,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String listScheduledMessagesAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listScheduledMessagesAsJSON(queue);
}
checkStarted();
@@ -800,7 +800,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public Map<String, Map<String, Object>[]> listDeliveringMessages() throws ActiveMQException {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listDeliveringMessages(queue);
}
checkStarted();
@@ -823,7 +823,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String listDeliveringMessagesAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listDeliveringMessagesAsJSON(queue);
}
checkStarted();
@@ -838,7 +838,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public Map<String, Object>[] listMessages(final String filterStr) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listMessages(queue, filterStr);
}
checkStarted();
@@ -875,7 +875,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String listMessagesAsJSON(final String filter) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listMessagesAsJSON(queue);
}
checkStarted();
@@ -889,7 +889,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
}
protected Map<String, Object>[] getFirstMessage() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getFirstMessage(queue);
}
checkStarted();
@@ -916,7 +916,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String getFirstMessageAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getFirstMessageAsJSON(queue);
}
return toJSON(getFirstMessage());
@@ -924,7 +924,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public Long getFirstMessageTimestamp() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getFirstMessageTimestamp(queue);
}
@@ -941,7 +941,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public Long getFirstMessageAge() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getFirstMessageAge(queue);
}
@@ -960,7 +960,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long countMessages(final String filterStr) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.countMessages(queue, filterStr);
}
@@ -970,7 +970,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String countMessages(final String filterStr, final String groupByProperty) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.countMessages(queue, filterStr, groupByProperty);
}
@@ -1010,7 +1010,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long countDeliveringMessages(final String filterStr) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.countDeliveringMessages(queue, filterStr);
}
@@ -1020,7 +1020,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String countDeliveringMessages(final String filterStr, final String groupByProperty) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.countDeliveringMessages(queue, filterStr, groupByProperty);
}
@@ -1066,7 +1066,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean removeMessage(final long messageID) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.removeMessage(queue, messageID);
}
checkStarted();
@@ -1088,7 +1088,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int removeMessages(final int flushLimit, final String filterStr) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.removeMessages(queue, flushLimit, filterStr);
}
checkStarted();
@@ -1122,7 +1122,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean expireMessage(final long messageID) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.expireMessage(queue, messageID);
}
checkStarted();
@@ -1137,7 +1137,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int expireMessages(final String filterStr) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.expireMessages(queue, filterStr);
}
checkStarted();
@@ -1155,7 +1155,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean retryMessage(final long messageID) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.retryMessage(queue, messageID);
}
@@ -1193,7 +1193,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int retryMessages() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.retryMessages(queue);
}
checkStarted();
@@ -1215,7 +1215,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
public boolean moveMessage(final long messageID,
final String otherQueueName,
final boolean rejectDuplicates) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.moveMessage(queue, messageID, otherQueueName, rejectDuplicates);
}
checkStarted();
@@ -1254,7 +1254,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
final String otherQueueName,
final boolean rejectDuplicates,
final int messageCount) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.moveMessages(queue, flushLimit, filterStr, otherQueueName, rejectDuplicates, messageCount);
}
checkStarted();
@@ -1286,7 +1286,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int sendMessagesToDeadLetterAddress(final String filterStr) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.sendMessagesToDeadLetterAddress(queue, filterStr);
}
checkStarted();
@@ -1308,8 +1308,8 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
boolean durable,
final String user,
final String password) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.sendMessage(queue, null, headers, type, body, durable, user, "****");
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.sendMessageThroughManagement(queue, headers, type, body, durable, user, "****");
}
try {
String s = sendMessage(queue.getAddress(), server, headers, type, body, durable, user, password, queue.getID());
@@ -1327,7 +1327,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean sendMessageToDeadLetterAddress(final long messageID) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.sendMessageToDeadLetterAddress(queue, messageID);
}
checkStarted();
@@ -1342,7 +1342,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int changeMessagesPriority(final String filterStr, final int newPriority) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.changeMessagesPriority(queue, filterStr, newPriority);
}
checkStarted();
@@ -1362,7 +1362,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean changeMessagePriority(final long messageID, final int newPriority) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.changeMessagePriority(queue, messageID, newPriority);
}
checkStarted();
@@ -1380,7 +1380,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String listMessageCounter() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listMessageCounter(queue);
}
checkStarted();
@@ -1397,7 +1397,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void resetMessageCounter() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resetMessageCounter(queue);
}
checkStarted();
@@ -1412,7 +1412,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String listMessageCounterAsHTML() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listMessageCounterAsHTML(queue);
}
checkStarted();
@@ -1427,7 +1427,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String listMessageCounterHistory() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listMessageCounterHistory(queue);
}
checkStarted();
@@ -1442,7 +1442,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String listMessageCounterHistoryAsHTML() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listMessageCounterHistoryAsHTML(queue);
}
checkStarted();
@@ -1457,7 +1457,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void pause() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.pause(queue);
}
checkStarted();
@@ -1482,7 +1482,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void pause(boolean persist) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.pause(queue, persist);
}
checkStarted();
@@ -1505,7 +1505,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
}
@Override
public void resume() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resume(queue);
}
checkStarted();
@@ -1530,7 +1530,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isPaused() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isPaused(queue);
}
checkStarted();
@@ -1550,7 +1550,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public CompositeData[] browse(int page, int pageSize, String filter) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.browse(queue, page, pageSize);
}
checkStarted();
@@ -1605,7 +1605,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
}
@Override
public CompositeData[] browse(String filter) throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.browse(queue, filter);
}
checkStarted();
@@ -1651,7 +1651,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void flushExecutor() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.flushExecutor(queue);
}
checkStarted();
@@ -1666,7 +1666,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void resetAllGroups() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resetAllGroups(queue);
}
checkStarted();
@@ -1681,7 +1681,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void resetGroup(String groupID) {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resetGroup(queue, groupID);
}
checkStarted();
@@ -1696,7 +1696,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int getGroupCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getGroupCount(queue);
}
checkStarted();
@@ -1711,7 +1711,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String listGroupsAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listGroupsAsJSON(queue);
}
checkStarted();
@@ -1742,7 +1742,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public long getRingSize() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getRingSize(queue);
}
checkStarted();
@@ -1757,7 +1757,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String listConsumersAsJSON() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.listConsumersAsJSON(queue);
}
checkStarted();
@@ -1798,7 +1798,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void resetMessagesAdded() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resetMessagesAdded(queue);
}
checkStarted();
@@ -1814,7 +1814,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void resetMessagesAcknowledged() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resetMessagesAcknowledged(queue);
}
checkStarted();
@@ -1830,7 +1830,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void resetMessagesExpired() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resetMessagesExpired(queue);
}
checkStarted();
@@ -1846,7 +1846,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public void resetMessagesKilled() throws Exception {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.resetMessagesKilled(queue);
}
checkStarted();
@@ -1862,7 +1862,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isGroupRebalance() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isGroupRebalance(queue);
}
checkStarted();
@@ -1877,7 +1877,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public boolean isGroupRebalancePauseDispatch() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.isGroupRebalancePauseDispatch(queue);
}
checkStarted();
@@ -1892,7 +1892,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int getGroupBuckets() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getGroupBuckets(queue);
}
checkStarted();
@@ -1907,7 +1907,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public String getGroupFirstKey() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getGroupFirstKey(queue);
}
checkStarted();
@@ -1924,7 +1924,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override
public int getPreparedTransactionMessageCount() {
- if (AuditLogger.isEnabled()) {
+ if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getPreparedTransactionMessageCount(queue);
}
checkStarted();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
index 93f7fe0..835647c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
@@ -195,7 +195,7 @@ public class SecurityStoreImpl implements SecurityStore, HierarchicalRepositoryC
connection.setAuditSubject(subject);
}
if (AuditLogger.isResourceLoggingEnabled()) {
- AuditLogger.userSuccesfullyLoggedInAudit(subject);
+ AuditLogger.userSuccesfullyAuthenticatedInAudit(subject, connection.getRemoteAddress());
}
return validatedUser;
@@ -375,7 +375,7 @@ public class SecurityStoreImpl implements SecurityStore, HierarchicalRepositoryC
ActiveMQServerLogger.LOGGER.securityProblemWhileAuthenticating(e.getMessage());
if (AuditLogger.isResourceLoggingEnabled()) {
- AuditLogger.userFailedLoggedInAudit(null, e.getMessage());
+ AuditLogger.userFailedAuthenticationInAudit(null, e.getMessage());
}
throw e;
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 ba7fe19..c06ac30 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
@@ -1673,11 +1673,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final OperationContext context,
final Map<SimpleString, RoutingType> prefixes,
final String securityDomain) throws Exception {
-
- if (AuditLogger.isEnabled()) {
- AuditLogger.createCoreSession(this, name, username, "****", minLargeMessageSize, connection, autoCommitSends,
- autoCommitAcks, preAcknowledge, xa, defaultAddress, callback, autoCreateQueues, context, prefixes);
- }
String validatedUser = "";
if (securityStore != null) {
@@ -1686,6 +1681,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
checkSessionLimit(validatedUser);
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.createCoreSession(this, connection.getAuditSubject(), connection.getRemoteAddress(), name, username, "****", minLargeMessageSize, connection, autoCommitSends,
+ autoCommitAcks, preAcknowledge, xa, defaultAddress, callback, autoCreateQueues, context, prefixes);
+ }
+
final ServerSessionImpl session = internalCreateSession(name, username, password, validatedUser, minLargeMessageSize, connection, autoCommitSends, autoCommitAcks, preAcknowledge, xa, defaultAddress, callback, context, autoCreateQueues, prefixes, securityDomain);
return session;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index cf56345..8704a39 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -493,8 +493,8 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
try {
Message message = reference.getMessage();
- if (AuditLogger.isMessageEnabled()) {
- AuditLogger.coreConsumeMessage(session.getRemotingConnection().getAuditSubject(), getQueueName().toString(), reference.toString());
+ if (AuditLogger.isMessageLoggingEnabled()) {
+ AuditLogger.coreConsumeMessage(session.getRemotingConnection().getAuditSubject(), session.getRemotingConnection().getRemoteAddress(), getQueueName().toString(), reference.toString());
}
if (server.hasBrokerMessagePlugins()) {
server.callBrokerMessagePlugins(plugin -> plugin.beforeDeliver(this, reference));
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 7d09366..eb072a3 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
@@ -524,8 +524,8 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
final boolean browseOnly,
final boolean supportLargeMessage,
final Integer credits) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.createCoreConsumer(this, getUsername(), consumerID, queueName, filterString, priority, browseOnly, supportLargeMessage, credits);
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.createCoreConsumer(this, remotingConnection.getAuditSubject(), remotingConnection.getRemoteAddress(), consumerID, queueName, filterString, priority, browseOnly, supportLargeMessage, credits);
}
final SimpleString unPrefixedQueueName = removePrefix(queueName);
@@ -714,8 +714,8 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
@Override
public Queue createQueue(QueueConfiguration queueConfiguration) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.createQueue(this, getUsername(), queueConfiguration);
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.createQueue(this, remotingConnection.getAuditSubject(), remotingConnection.getRemoteAddress(), queueConfiguration);
}
queueConfiguration
@@ -924,8 +924,8 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
public AddressInfo createAddress(final SimpleString address,
EnumSet<RoutingType> routingTypes,
final boolean autoCreated) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.serverSessionCreateAddress(this.getName(), getUsername(), address, routingTypes, autoCreated);
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.serverSessionCreateAddress(this.getName(), remotingConnection.getAuditSubject(), remotingConnection.getRemoteAddress(), address, routingTypes, autoCreated);
}
SimpleString realAddress = CompositeAddress.extractAddressName(address);
@@ -944,8 +944,8 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
@Override
public AddressInfo createAddress(AddressInfo addressInfo, boolean autoCreated) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.serverSessionCreateAddress(this.getName(), getUsername(), addressInfo, autoCreated);
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.serverSessionCreateAddress(this.getName(), remotingConnection.getAuditSubject(), remotingConnection.getRemoteAddress(), addressInfo, autoCreated);
}
AddressInfo art = getAddressAndRoutingType(addressInfo);
@@ -1034,8 +1034,8 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
@Override
public void createSharedQueue(QueueConfiguration queueConfiguration) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.createSharedQueue(this, getUsername(), queueConfiguration);
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.createSharedQueue(this, remotingConnection.getAuditSubject(), remotingConnection.getRemoteAddress(), queueConfiguration);
}
queueConfiguration.setAddress(removePrefix(queueConfiguration.getAddress()));
@@ -1161,8 +1161,8 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
@Override
public void deleteQueue(final SimpleString queueToDelete) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.destroyQueue(this, getUsername(), queueToDelete);
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.destroyQueue(this, remotingConnection.getAuditSubject(), remotingConnection.getRemoteAddress(), queueToDelete);
}
final SimpleString unPrefixedQueueName = removePrefix(queueToDelete);
@@ -1802,8 +1802,8 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
message.setMessageID(id);
}
- if (AuditLogger.isMessageEnabled()) {
- AuditLogger.coreSendMessage(getUsername(), message.toString(), routingContext);
+ if (AuditLogger.isMessageLoggingEnabled()) {
+ AuditLogger.coreSendMessage(remotingConnection.getAuditSubject(), remotingConnection.getRemoteAddress(), message.toString(), routingContext);
}
SimpleString address = message.getAddressSimpleString();
@@ -2048,8 +2048,8 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
private RoutingStatus handleManagementMessage(final Transaction tx,
final Message message,
final boolean direct) throws Exception {
- if (AuditLogger.isEnabled()) {
- AuditLogger.handleManagementMessage(this.getName(), getUsername(), tx, message, direct);
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.handleManagementMessage(this.getName(), remotingConnection.getAuditSubject(), remotingConnection.getRemoteAddress(), tx, message, direct);
}
try {
securityCheck(removePrefix(message.getAddressSimpleString()), CheckType.MANAGE, this);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/BasicAuthenticator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/BasicAuthenticator.java
index eda88a4..e23a4c2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/BasicAuthenticator.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/BasicAuthenticator.java
@@ -43,12 +43,12 @@ public class BasicAuthenticator implements JMXAuthenticator {
result = securityManager.authenticate(params[0], params[1], null, null);
if (result != null) {
if (AuditLogger.isResourceLoggingEnabled()) {
- AuditLogger.userSuccesfullyLoggedInAudit(result);
+ AuditLogger.userSuccesfullyAuthenticatedInAudit(result);
}
return result;
} else {
if (AuditLogger.isResourceLoggingEnabled()) {
- AuditLogger.userFailedLoggedInAudit(result, null);
+ AuditLogger.userFailedAuthenticationInAudit(result, null);
}
throw new SecurityException("Authentication failed");
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JaasAuthenticator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JaasAuthenticator.java
index 81e6106..1c440b3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JaasAuthenticator.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/JaasAuthenticator.java
@@ -74,12 +74,12 @@ public class JaasAuthenticator implements JMXAuthenticator {
});
loginContext.login();
if (AuditLogger.isResourceLoggingEnabled()) {
- AuditLogger.userSuccesfullyLoggedInAudit(subject);
+ AuditLogger.userSuccesfullyAuthenticatedInAudit(subject);
}
return subject;
} catch (LoginException e) {
if (AuditLogger.isResourceLoggingEnabled()) {
- AuditLogger.userFailedLoggedInAudit(subject, e.getMessage());
+ AuditLogger.userFailedAuthenticationInAudit(subject, e.getMessage());
}
throw new SecurityException("Authentication failed", e);
}
diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/AuthenticationFilter.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/AuthenticationFilter.java
index 86df499..7f395b7 100644
--- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/AuthenticationFilter.java
+++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/AuthenticationFilter.java
@@ -46,9 +46,9 @@ public class AuthenticationFilter implements Filter {
//status 200 means that the user has been authenticated, anything else must be a failure
if (status == 200) {
HttpSession session = ((Request) servletRequest).getSession();
- AuditLogger.userSuccesfullyLoggedInAudit(session != null ? (Subject) session.getAttribute("subject") : null);
+ AuditLogger.userSuccesfullyAuthenticatedInAudit(session != null ? (Subject) session.getAttribute("subject") : null);
} else {
- AuditLogger.userFailedLoggedInAudit("" + status);
+ AuditLogger.userFailedAuthenticationInAudit("" + status);
}
}
}
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index 59b7f17..89fa2c7 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -539,6 +539,27 @@
</execution>
<execution>
<phase>test-compile</phase>
+ <id>create-createAuditLoggingAMQPMutualSSL</id>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ <configuration>
+ <configuration>${basedir}/target/classes/servers/audit-logging-amqp-mutual-ssl</configuration>
+ <noWeb>false</noWeb>
+ <allowAnonymous>true</allowAnonymous>
+ <user>admin</user>
+ <password>admin</password>
+ <instance>${basedir}/target/audit-logging-amqp-mutual-ssl</instance>
+ <args>
+ <!-- this is needed to run the server remotely -->
+ <arg>--java-options</arg>
+ <arg>-Djava.rmi.server.hostname=localhost</arg>
+ <!--<arg>-Djava.rmi.server.hostname=localhost -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</arg>-->
+ </args>
+ </configuration>
+ </execution>
+ <execution>
+ <phase>test-compile</phase>
<id>create-jmx-failback</id>
<goals>
<goal>create</goal>
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/broker.xml b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/broker.xml
new file mode 100644
index 0000000..0166df4
--- /dev/null
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/broker.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
+ <core xmlns="urn:activemq:core">
+
+ <bindings-directory>./data/messaging/bindings</bindings-directory>
+
+ <journal-directory>./data/messaging/journal</journal-directory>
+
+ <large-messages-directory>./data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>./data/messaging/paging</paging-directory>
+
+ <acceptors>
+ <acceptor name="artemis">tcp://localhost:61616?securityDomain=guest</acceptor> <!-- this is only for the smoke test health-check -->
+ <acceptor name="netty-ssl-acceptor">tcp://localhost:5500?sslEnabled=true;needClientAuth=true;keyStorePath=server-side-keystore.jks;keyStorePassword=secureexample;trustStorePath=server-side-truststore.jks;trustStorePassword=secureexample</acceptor>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="exampleQueue">
+ <permission roles="consumers" type="consume"/>
+ <permission roles="producers" type="send"/>
+ </security-setting>
+ </security-settings>
+
+ <addresses>
+ <address name="exampleQueue">
+ <anycast>
+ <queue name="exampleQueue"/>
+ </anycast>
+ </address>
+ </addresses>
+ </core>
+</configuration>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/cert-roles.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/cert-roles.properties
new file mode 100644
index 0000000..39ac785
--- /dev/null
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/cert-roles.properties
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+producers=myUser
+consumers=myUser
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/cert-users.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/cert-users.properties
new file mode 100644
index 0000000..0d42b77
--- /dev/null
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/cert-users.properties
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+myUser=CN=ActiveMQ Artemis Client, OU=Artemis, O=ActiveMQ, L=AMQ, ST=AMQ, C=AMQ
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/client-side-keystore.jks b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/client-side-keystore.jks
new file mode 100644
index 0000000..654d691
Binary files /dev/null and b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/client-side-keystore.jks differ
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/client-side-truststore.jks b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/client-side-truststore.jks
new file mode 100644
index 0000000..95e451a
Binary files /dev/null and b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/client-side-truststore.jks differ
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/logging.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/logging.properties
new file mode 100644
index 0000000..7e0d9ca
--- /dev/null
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/logging.properties
@@ -0,0 +1,80 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Additional logger names to configure (root logger is always configured)
+# Root logger option
+loggers=org.eclipse.jetty,org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms.server,org.apache.activemq.artemis.integration.bootstrap,org.apache.activemq.audit.base,org.apache.activemq.audit.message,org.apache.activemq.audit.resource
+
+# Root logger level
+logger.level=INFO
+# ActiveMQ Artemis logger levels
+logger.org.apache.activemq.artemis.core.server.level=INFO
+logger.org.apache.activemq.artemis.journal.level=INFO
+logger.org.apache.activemq.artemis.utils.level=INFO
+logger.org.apache.activemq.artemis.jms.level=INFO
+logger.org.apache.activemq.artemis.integration.bootstrap.level=INFO
+logger.org.eclipse.jetty.level=WARN
+# Root logger handlers
+logger.handlers=FILE,CONSOLE
+
+logger.org.apache.activemq.audit.base.level=DEBUG
+logger.org.apache.activemq.audit.base.handlers=AUDIT_FILE
+logger.org.apache.activemq.audit.base.useParentHandlers=false
+
+logger.org.apache.activemq.audit.message.level=DEBUG
+logger.org.apache.activemq.audit.message.handlers=AUDIT_FILE
+logger.org.apache.activemq.audit.message.useParentHandlers=
+
+logger.org.apache.activemq.audit.resource.level=DEBUG
+logger.org.apache.activemq.audit.resource.handlers=AUDIT_FILE
+logger.org.apache.activemq.audit.resource.useParentHandlers=false
+
+# Console handler configuration
+handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
+handler.CONSOLE.properties=autoFlush
+handler.CONSOLE.level=DEBUG
+handler.CONSOLE.autoFlush=true
+handler.CONSOLE.formatter=PATTERN
+
+# File handler configuration
+handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
+handler.FILE.level=DEBUG
+handler.FILE.properties=suffix,append,autoFlush,fileName
+handler.FILE.suffix=.yyyy-MM-dd
+handler.FILE.append=true
+handler.FILE.autoFlush=true
+handler.FILE.fileName=../log/artemis.log
+handler.FILE.formatter=PATTERN
+
+# Formatter pattern configuration
+formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.PATTERN.properties=pattern
+formatter.PATTERN.pattern=%d %-5p [%c] %s%E%n
+
+#Audit logger
+handler.AUDIT_FILE.level=DEBUG
+handler.AUDIT_FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
+handler.AUDIT_FILE.properties=suffix,append,autoFlush,fileName
+handler.AUDIT_FILE.suffix=.yyyy-MM-dd
+handler.AUDIT_FILE.append=true
+handler.AUDIT_FILE.autoFlush=true
+handler.AUDIT_FILE.fileName=../log/audit.log
+handler.AUDIT_FILE.formatter=AUDIT_PATTERN
+
+formatter.AUDIT_PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.AUDIT_PATTERN.properties=pattern
+formatter.AUDIT_PATTERN.pattern=%d [AUDIT](%t) %s%E%n
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/login.config b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/login.config
new file mode 100644
index 0000000..7cc1a0d
--- /dev/null
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/login.config
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+activemq {
+ org.apache.activemq.artemis.spi.core.security.jaas.TextFileCertificateLoginModule required
+ debug=true
+ org.apache.activemq.jaas.textfiledn.user="cert-users.properties"
+ org.apache.activemq.jaas.textfiledn.role="cert-roles.properties";
+};
+
+guest {
+ org.apache.activemq.artemis.spi.core.security.jaas.GuestLoginModule sufficient
+ debug=false
+ org.apache.activemq.jaas.guest.user="guest"
+ org.apache.activemq.jaas.guest.role="guest";
+};
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/server-side-keystore.jks b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/server-side-keystore.jks
new file mode 100644
index 0000000..b7624b9
Binary files /dev/null and b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/server-side-keystore.jks differ
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/server-side-truststore.jks b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/server-side-truststore.jks
new file mode 100644
index 0000000..e039222
Binary files /dev/null and b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/server-side-truststore.jks differ
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/common/SmokeTestBase.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/common/SmokeTestBase.java
index 9a3231f..f9972df 100644
--- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/common/SmokeTestBase.java
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/common/SmokeTestBase.java
@@ -22,6 +22,7 @@ import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.util.HashSet;
import java.util.Set;
@@ -35,6 +36,8 @@ import org.junit.Assert;
public class SmokeTestBase extends ActiveMQTestBase {
Set<Process> processes = new HashSet<>();
+ private static final String JMX_SERVER_HOSTNAME = "localhost";
+ private static final int JMX_SERVER_PORT = 10099;
public static final String basedir = System.getProperty("basedir");
@@ -92,7 +95,11 @@ public class SmokeTestBase extends ActiveMQTestBase {
return process;
}
- protected static JMXConnector getJmxConnector(String hostname, int port) throws Exception {
+ protected JMXConnector getJmxConnector() throws MalformedURLException {
+ return getJmxConnector(JMX_SERVER_HOSTNAME, JMX_SERVER_PORT);
+ }
+
+ protected static JMXConnector getJmxConnector(String hostname, int port) throws MalformedURLException {
// Without this, the RMI server would bind to the default interface IP (the user's local IP mostly)
System.setProperty("java.rmi.server.hostname", hostname);
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerAMQPMutualSSLTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerAMQPMutualSSLTest.java
new file mode 100644
index 0000000..64f9d19
--- /dev/null
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerAMQPMutualSSLTest.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.smoke.logging;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import org.apache.qpid.jms.JmsConnectionFactory;
+import org.junit.Test;
+
+/**
+ * The various keystore files used for this test were generated using the following commands:
+ *
+ * keytool -genkey -keystore server-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis Server, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA
+ * keytool -export -keystore server-side-keystore.jks -file server-side-cert.cer -storepass secureexample
+ * keytool -import -keystore client-side-truststore.jks -file server-side-cert.cer -storepass secureexample -keypass secureexample -noprompt
+ * keytool -genkey -keystore client-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis Client, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA
+ * keytool -export -keystore client-side-keystore.jks -file client-side-cert.cer -storepass secureexample
+ * keytool -import -keystore server-side-truststore.jks -file client-side-cert.cer -storepass secureexample -keypass secureexample -noprompt
+ */
+public class AuditLoggerAMQPMutualSSLTest extends AuditLoggerTestBase {
+
+ @Override
+ protected String getServerName() {
+ return "audit-logging-amqp-mutual-ssl";
+ }
+
+ @Test
+ public void testAuditForProducerAndConsumer() throws Exception {
+ String sslhost = "amqps://localhost:5500";
+
+ int maxInactivityDurationInitialDelay = 30000;
+ int idleTimeout = 120000;
+ boolean verifyHost = false;
+ String keyStoreLocation = "target/" + getServerName() + "/etc/client-side-keystore.jks";
+ String keyStorePassword = "secureexample";
+ String trustStoreLocation = "target/" + getServerName() + "/etc/client-side-truststore.jks";
+ String trustStorePassword = "secureexample";
+
+ String remoteUri = sslhost +
+ "?maxInactivityDurationInitialDelay=" + maxInactivityDurationInitialDelay +
+ "&amqp.idleTimeout=" + idleTimeout +
+ "&transport.verifyHost=" + verifyHost +
+ "&transport.keyStoreLocation=" + keyStoreLocation +
+ "&transport.keyStorePassword=" + keyStorePassword +
+ "&transport.trustStoreLocation=" + trustStoreLocation +
+ "&transport.trustStorePassword=" + trustStorePassword;
+
+ ConnectionFactory connectionFactory = new JmsConnectionFactory(remoteUri);
+ try (Connection connection = connectionFactory.createConnection()) {
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = session.createQueue("exampleQueue");
+ MessageProducer sender = session.createProducer(queue);
+ TextMessage stm = session.createTextMessage("Hello world ");
+ stm.setStringProperty("foo", "bar");
+ sender.send(stm);
+ MessageConsumer consumer = session.createConsumer(queue);
+ connection.start();
+ Message m = consumer.receive(500);
+ assertNotNull(m);
+ }
+
+ checkAuditLogRecord(true, "AMQ601715: User myUser(producers)@", "successfully authenticated");
+ checkAuditLogRecord(true, "AMQ601267: User myUser(producers)@", "is creating a core session");
+ checkAuditLogRecord(true, "AMQ601500: User myUser(producers)@", "is sending a message AMQPStandardMessage");
+ checkAuditLogRecord(true, "AMQ601265: User myUser(producers)@", "is creating a core consumer");
+ checkAuditLogRecord(true, "AMQ601501: User myUser(producers)@", "is consuming a message from exampleQueue");
+ }
+}
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerResourceTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerResourceTest.java
index 76eb635..5452622 100644
--- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerResourceTest.java
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerResourceTest.java
@@ -16,6 +16,12 @@
*/
package org.apache.activemq.artemis.tests.smoke.logging;
+import javax.management.MBeanServerConnection;
+import javax.management.MBeanServerInvocationHandler;
+import javax.management.openmbean.CompositeData;
+import javax.management.remote.JMXConnector;
+import java.util.HashMap;
+
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
@@ -26,71 +32,18 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.api.core.management.QueueControl;
-import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
-import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
-import javax.management.MBeanServerConnection;
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.openmbean.CompositeData;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.HashMap;
-
-public class AuditLoggerResourceTest extends SmokeTestBase {
-
- private static final File auditLog = new File("target/audit-logging/log/audit.log");
+public class AuditLoggerResourceTest extends AuditLoggerTestBase {
- private static final String JMX_SERVER_HOSTNAME = "localhost";
- private static final int JMX_SERVER_PORT = 10099;
-
- public static final String SERVER_NAME = "audit-logging";
-
- @Before
- public void before() throws Exception {
- cleanupData(SERVER_NAME);
- disableCheckThread();
- startServer(SERVER_NAME, 0, 30000);
- emptyLogFile();
- }
-
- private void emptyLogFile() throws Exception {
- if (auditLog.exists()) {
- try (PrintWriter writer = new PrintWriter(new FileWriter(auditLog))) {
- writer.print("");
- }
- }
+ @Override
+ protected String getServerName() {
+ return "audit-logging";
}
@Test
public void testAuditResourceLog() throws Exception {
- HashMap environment = new HashMap();
- String[] credentials = new String[] {"admin", "admin"};
- environment.put(JMXConnector.CREDENTIALS, credentials);
- // Without this, the RMI server would bind to the default interface IP (the user's local IP mostly)
- System.setProperty("java.rmi.server.hostname", JMX_SERVER_HOSTNAME);
-
- // I don't specify both ports here manually on purpose. See actual RMI registry connection port extraction below.
- String urlString = "service:jmx:rmi:///jndi/rmi://" + JMX_SERVER_HOSTNAME + ":" + JMX_SERVER_PORT + "/jmxrmi";
-
- JMXServiceURL url = new JMXServiceURL(urlString);
- JMXConnector jmxConnector = null;
-
- try {
- jmxConnector = JMXConnectorFactory.connect(url, environment);
- System.out.println("Successfully connected to: " + urlString);
- } catch (Exception e) {
- jmxConnector = null;
- e.printStackTrace();
- Assert.fail(e.getMessage());
- }
+ JMXConnector jmxConnector = getJmxConnector();
try {
MBeanServerConnection mBeanServerConnection = jmxConnector.getMBeanServerConnection();
@@ -132,35 +85,4 @@ public class AuditLoggerResourceTest extends SmokeTestBase {
jmxConnector.close();
}
}
-
- //check the audit log has a line that contains all the values
- private void checkAuditLogRecord(boolean exist, String... values) throws Exception {
- Assert.assertTrue(auditLog.exists());
- boolean hasRecord = false;
- try (BufferedReader reader = new BufferedReader(new FileReader(auditLog))) {
- String line = reader.readLine();
- while (line != null) {
- if (line.contains(values[0])) {
- boolean hasAll = true;
- for (int i = 1; i < values.length; i++) {
- if (!line.contains(values[i])) {
- hasAll = false;
- break;
- }
- }
- if (hasAll) {
- hasRecord = true;
- System.out.println("audit has it: " + line);
- break;
- }
- }
- line = reader.readLine();
- }
- if (exist) {
- Assert.assertTrue(hasRecord);
- } else {
- Assert.assertFalse(hasRecord);
- }
- }
- }
}
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 4bb95ca..4cd33b9 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
@@ -16,6 +16,17 @@
*/
package org.apache.activemq.artemis.tests.smoke.logging;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.management.MBeanServerConnection;
+import javax.management.MBeanServerInvocationHandler;
+import javax.management.remote.JMXConnector;
+import java.util.UUID;
+
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.api.core.QueueConfiguration;
@@ -27,54 +38,23 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.api.core.management.AddressControl;
import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.utils.Base64;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.management.MBeanServerConnection;
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-import java.util.UUID;
-
-public class AuditLoggerTest extends SmokeTestBase {
-
- private static final File auditLog = new File("target/audit-logging2/log/audit.log");
-
- private static final String JMX_SERVER_HOSTNAME = "localhost";
- private static final int JMX_SERVER_PORT = 10099;
-
- public static final String SERVER_NAME = "audit-logging2";
+public class AuditLoggerTest extends AuditLoggerTestBase {
protected ClientSession session;
private ServerLocator locator;
private ClientSessionFactory sf;
@Before
+ @Override
public void before() throws Exception {
- cleanupData(SERVER_NAME);
- disableCheckThread();
- startServer(SERVER_NAME, 0, 30000);
- emptyLogFile();
+ super.before();
locator = createNonHALocator(true).setBlockOnNonDurableSend(true);
sf = createSessionFactory(locator);
session = sf.createSession("guest", "guest", false, true, false, false, 100);
@@ -82,12 +62,9 @@ public class AuditLoggerTest extends SmokeTestBase {
addClientSession(session);
}
- private void emptyLogFile() throws Exception {
- if (auditLog.exists()) {
- try (PrintWriter writer = new PrintWriter(new FileWriter(auditLog))) {
- writer.print("");
- }
- }
+ @Override
+ protected String getServerName() {
+ return "audit-logging2";
}
@Test
@@ -139,30 +116,6 @@ public class AuditLoggerTest extends SmokeTestBase {
checkAuditLogRecord(true, "is sending a message");
}
- protected JMXConnector getJmxConnector() throws MalformedURLException {
- HashMap environment = new HashMap();
- String[] credentials = new String[] {"admin", "admin"};
- environment.put(JMXConnector.CREDENTIALS, credentials);
- // Without this, the RMI server would bind to the default interface IP (the user's local IP mostly)
- System.setProperty("java.rmi.server.hostname", JMX_SERVER_HOSTNAME);
-
- // I don't specify both ports here manually on purpose. See actual RMI registry connection port extraction below.
- String urlString = "service:jmx:rmi:///jndi/rmi://" + JMX_SERVER_HOSTNAME + ":" + JMX_SERVER_PORT + "/jmxrmi";
-
- JMXServiceURL url = new JMXServiceURL(urlString);
- JMXConnector jmxConnector = null;
-
- try {
- jmxConnector = JMXConnectorFactory.connect(url, environment);
- System.out.println("Successfully connected to: " + urlString);
- } catch (Exception e) {
- jmxConnector = null;
- e.printStackTrace();
- Assert.fail(e.getMessage());
- }
- return jmxConnector;
- }
-
@Test
public void testAuditHotLogCore() throws Exception {
internalSend("CORE");
@@ -223,52 +176,4 @@ public class AuditLoggerTest extends SmokeTestBase {
connection.close();
}
}
-
- //check the audit log has a line that contains all the values
- private void checkAuditLogRecord(boolean exist, String... values) throws Exception {
- Assert.assertTrue(auditLog.exists());
- boolean hasRecord = false;
- try (BufferedReader reader = new BufferedReader(new FileReader(auditLog))) {
- String line = reader.readLine();
- while (line != null) {
- if (line.contains(values[0])) {
- boolean hasAll = true;
- for (int i = 1; i < values.length; i++) {
- if (!line.contains(values[i])) {
- hasAll = false;
- break;
- }
- }
- if (hasAll) {
- hasRecord = true;
- System.out.println("audit has it: " + line);
- break;
- }
- }
- line = reader.readLine();
- }
- if (exist) {
- Assert.assertTrue(hasRecord);
- } else {
- Assert.assertFalse(hasRecord);
- }
- }
- }
-
- public static ConnectionFactory createConnectionFactory(String protocol, String uri) {
- if (protocol.toUpperCase().equals("OPENWIRE")) {
- return new org.apache.activemq.ActiveMQConnectionFactory(uri);
- } else if (protocol.toUpperCase().equals("AMQP")) {
-
- if (uri.startsWith("tcp://")) {
- // replacing tcp:// by amqp://
- uri = "amqp" + uri.substring(3);
- }
- return new JmsConnectionFactory(uri);
- } else if (protocol.toUpperCase().equals("CORE") || protocol.toUpperCase().equals("ARTEMIS")) {
- return new org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory(uri);
- } else {
- throw new IllegalStateException("Unkown:" + protocol);
- }
- }
}
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTestBase.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTestBase.java
new file mode 100644
index 0000000..73aea8f
--- /dev/null
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTestBase.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.smoke.logging;
+
+import javax.jms.ConnectionFactory;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+
+import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
+import org.apache.qpid.jms.JmsConnectionFactory;
+import org.junit.Assert;
+import org.junit.Before;
+
+public abstract class AuditLoggerTestBase extends SmokeTestBase {
+
+ private File auditLog = null;
+
+ @Before
+ public void before() throws Exception {
+ cleanupData(getServerName());
+ disableCheckThread();
+ startServer(getServerName(), 0, 30000);
+ emptyLogFile();
+ }
+
+ private void emptyLogFile() throws Exception {
+ if (getAuditLog().exists()) {
+ try (PrintWriter writer = new PrintWriter(new FileWriter(getAuditLog()))) {
+ writer.print("");
+ }
+ }
+ }
+
+ protected File getAuditLog() {
+ if (auditLog == null) {
+ auditLog = new File("target/" + getServerName() + "/log/audit.log");
+ }
+ return auditLog;
+ }
+
+ abstract String getServerName();
+
+ //check the audit log has a line that contains all the values
+ protected void checkAuditLogRecord(boolean exist, String... values) throws Exception {
+ Assert.assertTrue(getAuditLog().exists());
+ boolean hasRecord = false;
+ try (BufferedReader reader = new BufferedReader(new FileReader(getAuditLog()))) {
+ String line = reader.readLine();
+ while (line != null) {
+ if (line.contains(values[0])) {
+ boolean hasAll = true;
+ for (int i = 1; i < values.length; i++) {
+ if (!line.contains(values[i])) {
+ hasAll = false;
+ break;
+ }
+ }
+ if (hasAll) {
+ hasRecord = true;
+ System.out.println("audit has it: " + line);
+ break;
+ }
+ }
+ line = reader.readLine();
+ }
+ if (exist) {
+ Assert.assertTrue(hasRecord);
+ } else {
+ Assert.assertFalse(hasRecord);
+ }
+ }
+ }
+
+ public static ConnectionFactory createConnectionFactory(String protocol, String uri) {
+ if (protocol.toUpperCase().equals("OPENWIRE")) {
+ return new org.apache.activemq.ActiveMQConnectionFactory(uri);
+ } else if (protocol.toUpperCase().equals("AMQP")) {
+
+ if (uri.startsWith("tcp://")) {
+ // replacing tcp:// by amqp://
+ uri = "amqp" + uri.substring(3);
+ }
+ return new JmsConnectionFactory(uri);
+ } else if (protocol.toUpperCase().equals("CORE") || protocol.toUpperCase().equals("ARTEMIS")) {
+ return new org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory(uri);
+ } else {
+ throw new IllegalStateException("Unkown:" + protocol);
+ }
+ }
+}