[prev in list] [next in list] [prev in thread] [next in thread] 

List:       activemq-commits
Subject:    [activemq-artemis] branch main updated: NO-JIRA Update Paging Logging with extra information
From:       clebertsuconic () apache ! org
Date:       2021-09-24 17:23:04
Message-ID: 163250418437.10900.12947609653929199878 () gitbox ! apache ! org
[Download RAW message or body]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new e4276e8  NO-JIRA Update Paging Logging with extra information
e4276e8 is described below

commit e4276e8cd0b86445da4209dab720b4251300682a
Author: Clebert Suconic <clebertsuconic@apache.org>
AuthorDate: Fri Sep 24 13:16:56 2021 -0400

    NO-JIRA Update Paging Logging with extra information
---
 .../artemis/core/paging/cursor/impl/PageSubscriptionImpl.java        | 5 ++++-
 .../apache/activemq/artemis/core/server/ActiveMQServerLogger.java    | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java \
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
 index a009ed1..5178096 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
                
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
 @@ -920,7 +920,10 @@ public final class PageSubscriptionImpl implements \
PageSubscription {  }
 
             if (cache == null || pos.getMessageNr() >= 0 && cache.getMessage(pos) == \
                null) {
-               ActiveMQServerLogger.LOGGER.pageNotFound(pos);
+               try {
+                  ActiveMQServerLogger.LOGGER.pageNotFound(pos, this.cursorId, \
this.queue.getName().toString()); +               } catch (Throwable ignored) {
+               }
                if (txDeleteCursorOnReload == -1) {
                   txDeleteCursorOnReload = store.generateID();
                }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java \
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
 index fa41d45..0cfae2a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
                
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
 @@ -571,9 +571,9 @@ public interface ActiveMQServerLogger extends BasicLogger {
    void timedOutFlushingExecutorsPagingCursor(PageSubscription pageSubscription);
 
    @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 222028, value = "Could not find page cache for page {0} removing it \
from the journal", +   @Message(id = 222028, value = "Could not find page cache for \
page {0}, on queue {1}/{2} removing it from the journal",  format = \
                Message.Format.MESSAGE_FORMAT)
-   void pageNotFound(PagePosition pos);
+   void pageNotFound(PagePosition pos, long queueID, String queue);
 
    @LogMessage(level = Logger.Level.WARN)
    @Message(id = 222029,


[prev in list] [next in list] [prev in thread] [next in thread]