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 2022/05/10 16:03:26 UTC
[activemq-artemis] 07/19: progress
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit a4c54a2a1a4ae44ce03657c5237f7994117ea58e
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue May 3 12:55:43 2022 -0400
progress
---
.../activemq/artemis/logprocessor/CodeFactory.java | 11 ++++++-----
.../activemq/artemis/logs/ActiveMQUtilLogger.java | 3 ++-
.../apache/activemq/artemis/logs/AuditLogger.java | 23 +++++++---------------
3 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logprocessor/CodeFactory.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logprocessor/CodeFactory.java
index 46bbba1935..5169d1deb4 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logprocessor/CodeFactory.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logprocessor/CodeFactory.java
@@ -24,7 +24,12 @@ import static java.security.AccessController.doPrivileged;
public class CodeFactory {
- public static <T> T getBundle(final Class<T> type) {
+
+ public static <T> T getCodeClass(final Class<T> type) {
+ return getCodeClass(type, type.getClass().getName());
+ }
+
+ public static <T> T getCodeClass(final Class<T> type, String category) {
return doPrivileged(new PrivilegedAction<T>() {
public T run() {
try {
@@ -47,8 +52,4 @@ public class CodeFactory {
});
}
- public static <T> T getMessageLogger(Class<T> type) {
- return getBundle(type);
- }
-
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
index a0883cd386..8ef763a3b6 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.logs;
+import io.netty.util.internal.logging.Slf4JLoggerFactory;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
import org.apache.activemq.artemis.logprocessor.annotation.ArtemisBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
@@ -26,7 +27,7 @@ import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
@ArtemisBundle(projectCode = "AMQ")
public interface ActiveMQUtilLogger {
- ActiveMQUtilLogger LOGGER = CodeFactory.getMessageLogger(ActiveMQUtilLogger.class);
+ ActiveMQUtilLogger LOGGER = CodeFactory.getCodeClass(ActiveMQUtilLogger.class);
@LogMessage(id = 201000, value = "Network is healthy, starting service {0}", level = LogMessage.Level.INFO)
void startingService(String component);
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 71ac6e3d1e..4edae86368 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
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.artemis.logs;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.ArtemisBundle;
import org.jboss.logging.BasicLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,24 +35,13 @@ import java.util.Set;
/**
* Logger Code 60
- *
- * each message id must be 6 digits long starting with 60, the 3rd digit donates the level so
- *
- * INF0 1
- * WARN 2
- * DEBUG 3
- * ERROR 4
- * TRACE 5
- * FATAL 6
- *
- * so an INFO message would be 601000 to 601999
*/
-@MessageLogger(projectCode = "AMQ")
-public interface AuditLogger extends BasicLogger {
+@ArtemisBundle(projectCode = "AMQ")
+public interface AuditLogger {
- 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");
+ AuditLogger BASE_LOGGER = CodeFactory.getCodeClass(AuditLogger.class, "org.apache.activemq.audit.base");
+ AuditLogger RESOURCE_LOGGER = CodeFactory.getCodeClass(AuditLogger.class, "org.apache.activemq.audit.resource");
+ AuditLogger MESSAGE_LOGGER = CodeFactory.getCodeClass(AuditLogger.class, "org.apache.activemq.audit.message");
ThreadLocal<String> remoteAddress = new ThreadLocal<>();