You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2024/10/01 18:15:46 UTC

(activemq-artemis) branch main updated: ARTEMIS-5073 formatting error of AMQ601771 audit log event

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new a89c452ab7 ARTEMIS-5073 formatting error of AMQ601771 audit log event
a89c452ab7 is described below

commit a89c452ab76bd34c0550c5f33a7a93674dc49da0
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Sat Sep 28 12:05:50 2024 -0500

    ARTEMIS-5073 formatting error of AMQ601771 audit log event
---
 .../src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java | 6 +++---
 .../artemis/core/management/impl/ActiveMQServerControlImpl.java     | 2 +-
 2 files changed, 4 insertions(+), 4 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 13d78f72c6..d37927fe13 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
@@ -2668,12 +2668,12 @@ public interface AuditLogger {
    @LogMessage(id = 601770, value = "User {} is clearing authorization cache on target resource: {}", level = LogMessage.Level.INFO)
    void clearAuthorizationCache(String user, Object source);
 
-   static void getCurrentTimeMillis() {
-      BASE_LOGGER.getCurrentTimeMillis(getCaller());
+   static void getCurrentTimeMillis(Object source) {
+      BASE_LOGGER.getCurrentTimeMillis(getCaller(), source);
    }
 
    @LogMessage(id = 601771, value = "User {} is getting name on target resource: {}", level = LogMessage.Level.INFO)
-   void getCurrentTimeMillis(Object source);
+   void getCurrentTimeMillis(String user, Object source);
 
    static void getProducerWindowSize(Object source) {
       BASE_LOGGER.getProducerWindowSize(getCaller(), source);
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 7076a22736..8adb67ce53 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
@@ -230,7 +230,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
    @Override
    public long getCurrentTimeMillis() {
       if (AuditLogger.isBaseLoggingEnabled()) {
-         AuditLogger.getCurrentTimeMillis();
+         AuditLogger.getCurrentTimeMillis(this.server);
       }
       return System.currentTimeMillis();
    }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact