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/07/22 17:51:54 UTC
[activemq-artemis] branch new-logging updated (d32bc13fb1 -> a3bc6d49a6)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
discard d32bc13fb1 add log config to get NettyNativeTest working
discard 413577537c simplify test logging config again, adjust assertion to be more specific and take into account change in output from 07329118c10d14bce018a580b0dadbcf081233a8
discard d94bd6b3a4 add log config for AuditLoggerAMQPMutualSSLTest
discard 07329118c1 ARTEMIS-3902 Adding Reason to Security Exception
discard f6f5aa0859 add some TODO notes from memory
discard af8ce03072 add some [in-flux] config to get more failing audit log smoke tests passing
discard 629eec9b86 apply needed change only, and remove old unused logging.properties file
discard 9e25c933f0 reset smoke test config to current base assembly config
discard 5f8b8111e9 some more helper additions to bring default assembly logging config into line with prior config
discard 8bfc5ad425 Adding a test with no argument on exception (just to be sure)
discard f6d673cb16 Removing @Cause annotation
discard 7eb9d2b385 fix up errorprone error and an IDE warning
discard e9b367fbe1 ensure exceptions/causes are the last arg passed, as the logging framework expects, and processor now enforces
discard 8c4df69ceb fix checkstyle on processor
discard ec219d8aeb small tweak on test
discard 4fd4a1f8d8 Enforcing exception as the last argument
discard dd3dea4098 log processing improvement with exceptions
discard 033afc4d7e flesh out assembly default logging config, give output like previous behaviour
discard 0bdc69d313 Removing Reload4J
discard 0cdba28438 fix some more placeholders missed previously
discard d1afdee694 make basic start on audit log file config, add [unfinished] config changes to get AuditLoggerResourceTest smoke test passing
discard b087b32020 reorder args to match previously out-of-order placeholders, ensure new output matches previous
discard 4553705893 remove now-unnecessary quote escaping from log/message bundle format strings, giving same output as before switch to slf4j formatter
discard 86dc2bba13 switch to released 2.0.0 artemis-native dep
discard d7f93bcf92 Fixing up some {0} versus {}
discard b8b28cc2b9 re-enable GHA CI runs in the main repo, build now in state it can pass the PR test subset (except for d153efde4e04703875c92fdcb45f9f65b87a215b needing reverted which would make it fail)
discard 07656fe0b4 add TODO for another fun task
discard 6f974985f0 fix various test failures due to unexpected message string; also make some tests indicate why they failed
discard d4027afa10 temporarily remove test to allow concentrating on other issues
discard 30106d0f52 fix test missed in prior change
discard d0033e928a fix format of code prefix in messages, pointed out by failing test
discard b9485089e4 make a start on a basic loging config for distribution
discard 7c8f45bf7f add some more needed deps; essentially every module with tests (or without specific log test config) will need this to avoid a stacktrace from logging setup issues
discard 10458ff659 avoid NPE in a unit test due to audit loggers still being enabled, unlike prior test logging config
discard 4411c06196 Using Artemis Native 2.1.0 snapshot until 2.0.0 is released
discard 3a1ae3d310 add some deps needed/used already, look into test failure
discard 1258903869 fixup for release profile following prior rebases+squashes
discard 9dae1eb11a add commons-logging -> SLF4J bridge and exclude commons-logging, suppresses unconfigured log spam from beanutils etc
discard eb8e93b6ad basic logging config and some more on AssertionLoggerHandler to get some tests using it working
discard 5abd4ef52a make a start on restoring AssertionLoggerHandler to get tests going
discard d1545f382d Artemis native at 2.0 snapshot
discard c9bc95dfbe squashed logging changes from Clebert + me, rebased onto main at 688b894c6205058c24d225b340aea1d8a5599902
add cc4867ccba [maven-release-plugin] prepare release 2.24.0
add 79daf49105 [maven-release-plugin] prepare for next development iteration
add 4737c5c889 ARTEMIS-3901 Fix artemis perf client --durable fails on exception
add e35758a4d0 ARTEMIS-3901 Improvements on PerfCommand
add 3d5f588bbe This closes #4154
add db8f530256 ARTEMIS-3902 Adding reason to Audit Security Message
add 55865ab4b4 Revert "ARTEMIS-3902 Adding reason to Audit Security Message"
new 3d200b32da squashed logging changes from Clebert + me, rebased onto main at 688b894c6205058c24d225b340aea1d8a5599902
new 18a7bba02f Artemis native at 2.0 snapshot
new 8816ef28b8 make a start on restoring AssertionLoggerHandler to get tests going
new 5027f276b6 basic logging config and some more on AssertionLoggerHandler to get some tests using it working
new a120f1b2ff add commons-logging -> SLF4J bridge and exclude commons-logging, suppresses unconfigured log spam from beanutils etc
new 2291f0e96e fixup for release profile following prior rebases+squashes
new b7111822ac add some deps needed/used already, look into test failure
new 7ccaabbe94 Using Artemis Native 2.1.0 snapshot until 2.0.0 is released
new 994d69ce15 avoid NPE in a unit test due to audit loggers still being enabled, unlike prior test logging config
new d1978ee438 add some more needed deps; essentially every module with tests (or without specific log test config) will need this to avoid a stacktrace from logging setup issues
new 38f28c48dd make a start on a basic loging config for distribution
new 86e73cd83d fix format of code prefix in messages, pointed out by failing test
new de66f8f025 fix test missed in prior change
new be9168c7b4 temporarily remove test to allow concentrating on other issues
new 61bc193f63 fix various test failures due to unexpected message string; also make some tests indicate why they failed
new f42775a596 add TODO for another fun task
new fe017feaf4 re-enable GHA CI runs in the main repo, build now in state it can pass the PR test subset (except for d153efde4e04703875c92fdcb45f9f65b87a215b needing reverted which would make it fail)
new b670de4286 Fixing up some {0} versus {}
new b05159b850 switch to released 2.0.0 artemis-native dep
new d2faca81a3 remove now-unnecessary quote escaping from log/message bundle format strings, giving same output as before switch to slf4j formatter
new 0bd386a7c0 reorder args to match previously out-of-order placeholders, ensure new output matches previous
new 6ccbf15030 make basic start on audit log file config, add [unfinished] config changes to get AuditLoggerResourceTest smoke test passing
new 8e81c2d76f fix some more placeholders missed previously
new a67f4ef487 Removing Reload4J
new 9f7c1024eb flesh out assembly default logging config, give output like previous behaviour
new b624a43173 log processing improvement with exceptions
new 6b1814108f Enforcing exception as the last argument
new 6885cf1a06 small tweak on test
new a633cd2e7a fix checkstyle on processor
new 3da9d6aa78 ensure exceptions/causes are the last arg passed, as the logging framework expects, and processor now enforces
new 4852c80480 fix up errorprone error and an IDE warning
new 9ac5943404 Removing @Cause annotation
new 53d6eb1555 Adding a test with no argument on exception (just to be sure)
new db0d5b41a2 some more helper additions to bring default assembly logging config into line with prior config
new 019bd4c2ea reset smoke test config to current base assembly config
new f96af1b43e apply needed change only, and remove old unused logging.properties file
new b3f1316ce6 add some [in-flux] config to get more failing audit log smoke tests passing
new 3dae6f5a9f add some TODO notes from memory
new 47a66ec9ff ARTEMIS-3902 Adding Reason to Security Exception
new f3a3500bc3 add log config for AuditLoggerAMQPMutualSSLTest
new 654d50b8b2 simplify test logging config again, adjust assertion to be more specific and take into account change in output from 07329118c10d14bce018a580b0dadbcf081233a8
new a3bc6d49a6 add log config to get NettyNativeTest working
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d32bc13fb1)
\
N -- N -- N refs/heads/new-logging (a3bc6d49a6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 42 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
artemis-boot/pom.xml | 2 +-
artemis-cdi-client/pom.xml | 2 +-
artemis-cli/pom.xml | 2 +-
.../commands/messages/perf/PerfClientCommand.java | 197 +++++++++++++++++++++
.../cli/commands/messages/perf/PerfCommand.java | 75 ++++++++
.../activemq/cli/test/CliPerfClientTest.java | 67 +++++++
artemis-commons/pom.xml | 2 +-
artemis-core-client-all/pom.xml | 2 +-
artemis-core-client-osgi/pom.xml | 2 +-
artemis-core-client/pom.xml | 2 +-
artemis-distribution/pom.xml | 2 +-
artemis-dto/pom.xml | 2 +-
artemis-features/pom.xml | 2 +-
artemis-hawtio/activemq-branding/pom.xml | 2 +-
artemis-hawtio/artemis-console/pom.xml | 2 +-
artemis-hawtio/artemis-plugin/pom.xml | 2 +-
artemis-hawtio/pom.xml | 2 +-
artemis-jakarta-client-all/pom.xml | 2 +-
artemis-jakarta-client/pom.xml | 2 +-
artemis-jakarta-ra/pom.xml | 2 +-
artemis-jakarta-server/pom.xml | 2 +-
artemis-jakarta-service-extensions/pom.xml | 2 +-
artemis-jdbc-store/pom.xml | 2 +-
artemis-jms-client-all/pom.xml | 2 +-
artemis-jms-client-osgi/pom.xml | 2 +-
artemis-jms-client/pom.xml | 2 +-
artemis-jms-server/pom.xml | 2 +-
artemis-journal/pom.xml | 2 +-
artemis-junit/pom.xml | 2 +-
artemis-maven-plugin/pom.xml | 2 +-
artemis-protocols/artemis-amqp-protocol/pom.xml | 2 +-
artemis-protocols/artemis-hornetq-protocol/pom.xml | 2 +-
.../artemis-hqclient-protocol/pom.xml | 2 +-
artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 +-
.../artemis-openwire-protocol/pom.xml | 2 +-
artemis-protocols/artemis-stomp-protocol/pom.xml | 2 +-
artemis-protocols/pom.xml | 2 +-
artemis-quorum-api/pom.xml | 2 +-
artemis-quorum-ri/pom.xml | 2 +-
artemis-ra/pom.xml | 2 +-
artemis-rest/pom.xml | 2 +-
artemis-selector/pom.xml | 2 +-
artemis-server-osgi/pom.xml | 2 +-
artemis-server/pom.xml | 2 +-
artemis-service-extensions/pom.xml | 2 +-
artemis-unit-test-support/pom.xml | 2 +-
artemis-web/pom.xml | 2 +-
artemis-website/pom.xml | 2 +-
.../amqp-receiving-messages/pom.xml | 2 +-
.../amqp-sending-messages-multicast/pom.xml | 2 +-
.../amqp-sending-messages/pom.xml | 2 +-
.../broker-connection/amqp-sending-overssl/pom.xml | 2 +-
.../broker-connection/disaster-recovery/pom.xml | 2 +-
examples/features/broker-connection/pom.xml | 2 +-
.../clustered/client-side-load-balancing/pom.xml | 2 +-
.../clustered-durable-subscription/pom.xml | 2 +-
.../features/clustered/clustered-grouping/pom.xml | 2 +-
.../features/clustered/clustered-jgroups/pom.xml | 2 +-
.../features/clustered/clustered-queue/pom.xml | 2 +-
.../clustered-static-discovery-uri/pom.xml | 2 +-
.../clustered/clustered-static-discovery/pom.xml | 2 +-
.../clustered/clustered-static-oneway/pom.xml | 2 +-
.../features/clustered/clustered-topic-uri/pom.xml | 2 +-
.../features/clustered/clustered-topic/pom.xml | 2 +-
examples/features/clustered/pom.xml | 2 +-
.../clustered/queue-message-redistribution/pom.xml | 2 +-
.../shared-storage-static-cluster/pom.xml | 2 +-
.../features/clustered/symmetric-cluster/pom.xml | 2 +-
.../connection-router/evenly-redirect/pom.xml | 2 +-
examples/features/connection-router/pom.xml | 2 +-
.../connection-router/symmetric-redirect/pom.xml | 2 +-
.../connection-router/symmetric-simple/pom.xml | 2 +-
.../federation/federated-address-divert/pom.xml | 2 +-
.../federated-address-downstream-upstream/pom.xml | 2 +-
.../federated-address-downstream/pom.xml | 2 +-
.../features/federation/federated-address/pom.xml | 2 +-
.../federated-queue-downstream-upstream/pom.xml | 2 +-
.../federation/federated-queue-downstream/pom.xml | 2 +-
.../features/federation/federated-queue/pom.xml | 2 +-
examples/features/federation/pom.xml | 2 +-
.../features/ha/application-layer-failover/pom.xml | 2 +-
.../ha/client-side-failoverlistener/pom.xml | 2 +-
.../ha/colocated-failover-scale-down/pom.xml | 2 +-
examples/features/ha/colocated-failover/pom.xml | 2 +-
examples/features/ha/ha-policy-autobackup/pom.xml | 2 +-
.../features/ha/multiple-failover-failback/pom.xml | 2 +-
examples/features/ha/multiple-failover/pom.xml | 2 +-
.../features/ha/non-transaction-failover/pom.xml | 2 +-
examples/features/ha/pom.xml | 2 +-
.../features/ha/replicated-failback-static/pom.xml | 2 +-
examples/features/ha/replicated-failback/pom.xml | 2 +-
.../ha/replicated-multiple-failover/pom.xml | 2 +-
.../ha/replicated-transaction-failover/pom.xml | 2 +-
examples/features/ha/scale-down/pom.xml | 2 +-
examples/features/ha/stop-server-failover/pom.xml | 2 +-
examples/features/ha/transaction-failover/pom.xml | 2 +-
.../ha/zookeeper-single-pair-failback/pom.xml | 2 +-
examples/features/perf/perf/pom.xml | 2 +-
examples/features/perf/pom.xml | 2 +-
examples/features/perf/soak/pom.xml | 2 +-
examples/features/pom.xml | 2 +-
examples/features/standard/auto-closeable/pom.xml | 2 +-
.../standard/broker-msg-auth-plugin/pom.xml | 2 +-
examples/features/standard/broker-plugin/pom.xml | 2 +-
examples/features/standard/browser/pom.xml | 2 +-
.../features/standard/camel/camel-broker/pom.xml | 2 +-
examples/features/standard/camel/camel-war/pom.xml | 2 +-
examples/features/standard/camel/pom.xml | 2 +-
examples/features/standard/cdi/pom.xml | 2 +-
examples/features/standard/client-kickoff/pom.xml | 2 +-
.../features/standard/completion-listener/pom.xml | 2 +-
.../features/standard/consumer-rate-limit/pom.xml | 2 +-
examples/features/standard/context/pom.xml | 2 +-
examples/features/standard/core-bridge/pom.xml | 2 +-
examples/features/standard/database/pom.xml | 2 +-
examples/features/standard/dead-letter/pom.xml | 2 +-
.../features/standard/delayed-redelivery/pom.xml | 2 +-
examples/features/standard/divert/pom.xml | 2 +-
.../features/standard/durable-subscription/pom.xml | 2 +-
examples/features/standard/embedded-simple/pom.xml | 2 +-
examples/features/standard/embedded/pom.xml | 2 +-
examples/features/standard/exclusive-queue/pom.xml | 2 +-
examples/features/standard/expiry/pom.xml | 2 +-
examples/features/standard/http-transport/pom.xml | 2 +-
.../instantiate-connection-factory/pom.xml | 2 +-
.../features/standard/interceptor-amqp/pom.xml | 2 +-
.../features/standard/interceptor-client/pom.xml | 2 +-
.../features/standard/interceptor-mqtt/pom.xml | 2 +-
examples/features/standard/interceptor/pom.xml | 2 +-
examples/features/standard/jms-bridge/pom.xml | 2 +-
examples/features/standard/jmx-ssl/pom.xml | 2 +-
examples/features/standard/jmx/pom.xml | 2 +-
examples/features/standard/large-message/pom.xml | 2 +-
.../features/standard/last-value-queue/pom.xml | 2 +-
.../standard/management-notifications/pom.xml | 2 +-
examples/features/standard/management/pom.xml | 2 +-
.../features/standard/message-counters/pom.xml | 2 +-
examples/features/standard/message-group/pom.xml | 2 +-
examples/features/standard/message-group2/pom.xml | 2 +-
.../features/standard/message-priority/pom.xml | 2 +-
examples/features/standard/netty-openssl/pom.xml | 2 +-
.../standard/no-consumer-buffering/pom.xml | 2 +-
examples/features/standard/opentracing/pom.xml | 2 +-
examples/features/standard/paging/pom.xml | 2 +-
examples/features/standard/pom.xml | 2 +-
examples/features/standard/pre-acknowledge/pom.xml | 2 +-
.../features/standard/producer-rate-limit/pom.xml | 2 +-
examples/features/standard/queue-jakarta/pom.xml | 2 +-
examples/features/standard/queue-requestor/pom.xml | 2 +-
examples/features/standard/queue-selector/pom.xml | 2 +-
examples/features/standard/queue/pom.xml | 2 +-
examples/features/standard/reattach-node/pom.xml | 2 +-
examples/features/standard/request-reply/pom.xml | 2 +-
examples/features/standard/rest/dup-send/pom.xml | 2 +-
.../features/standard/rest/javascript-chat/pom.xml | 2 +-
.../features/standard/rest/jms-to-rest/pom.xml | 2 +-
examples/features/standard/rest/pom.xml | 2 +-
examples/features/standard/rest/push/pom.xml | 2 +-
.../features/standard/scheduled-message/pom.xml | 2 +-
.../features/standard/security-keycloak/pom.xml | 2 +-
examples/features/standard/security-ldap/pom.xml | 2 +-
.../features/standard/security-manager/pom.xml | 2 +-
examples/features/standard/security/pom.xml | 2 +-
.../standard/send-acknowledgements/pom.xml | 2 +-
examples/features/standard/shared-consumer/pom.xml | 2 +-
examples/features/standard/slow-consumer/pom.xml | 2 +-
.../standard/spring-boot-integration/pom.xml | 2 +-
.../features/standard/spring-integration/pom.xml | 2 +-
.../features/standard/ssl-enabled-crl-mqtt/pom.xml | 2 +-
.../ssl-enabled-dual-authentication/pom.xml | 2 +-
examples/features/standard/ssl-enabled/pom.xml | 2 +-
examples/features/standard/static-selector/pom.xml | 2 +-
examples/features/standard/temp-queue/pom.xml | 2 +-
.../features/standard/topic-hierarchies/pom.xml | 2 +-
examples/features/standard/topic-selector1/pom.xml | 2 +-
examples/features/standard/topic-selector2/pom.xml | 2 +-
examples/features/standard/topic/pom.xml | 2 +-
examples/features/standard/transactional/pom.xml | 2 +-
examples/features/standard/xa-heuristic/pom.xml | 2 +-
examples/features/standard/xa-receive/pom.xml | 2 +-
examples/features/standard/xa-send/pom.xml | 2 +-
.../sub-modules/artemis-jakarta-ra-rar/pom.xml | 2 +-
.../features/sub-modules/artemis-ra-rar/pom.xml | 2 +-
.../inter-broker-bridge/artemis-jms-bridge/pom.xml | 2 +-
.../sub-modules/inter-broker-bridge/pom.xml | 2 +-
examples/features/sub-modules/pom.xml | 2 +-
examples/features/sub-modules/tomcat/pom.xml | 2 +-
examples/pom.xml | 2 +-
examples/protocols/amqp/pom.xml | 2 +-
.../protocols/amqp/proton-clustered-cpp/pom.xml | 2 +-
examples/protocols/amqp/proton-cpp/pom.xml | 2 +-
examples/protocols/amqp/proton-ruby/pom.xml | 2 +-
examples/protocols/amqp/queue/pom.xml | 2 +-
examples/protocols/amqp/sasl-scram/pom.xml | 2 +-
.../protocols/mqtt/clustered-queue-mqtt/pom.xml | 2 +-
examples/protocols/mqtt/pom.xml | 2 +-
examples/protocols/mqtt/publish-subscribe/pom.xml | 2 +-
examples/protocols/openwire/chat/pom.xml | 2 +-
.../protocols/openwire/message-listener/pom.xml | 2 +-
.../protocols/openwire/message-recovery/pom.xml | 2 +-
examples/protocols/openwire/pom.xml | 2 +-
examples/protocols/openwire/queue/pom.xml | 2 +-
.../openwire/virtual-topic-mapping/pom.xml | 2 +-
examples/protocols/pom.xml | 2 +-
examples/protocols/stomp/pom.xml | 2 +-
.../stomp/stomp-dual-authentication/pom.xml | 2 +-
.../stomp/stomp-embedded-interceptor/pom.xml | 2 +-
examples/protocols/stomp/stomp-jms/pom.xml | 2 +-
examples/protocols/stomp/stomp-websockets/pom.xml | 2 +-
examples/protocols/stomp/stomp/pom.xml | 2 +-
examples/protocols/stomp/stomp1.1/pom.xml | 2 +-
examples/protocols/stomp/stomp1.2/pom.xml | 2 +-
integration/activemq-spring-integration/pom.xml | 2 +-
pom.xml | 2 +-
tests/activemq5-unit-tests/pom.xml | 2 +-
tests/artemis-test-support/pom.xml | 2 +-
tests/compatibility-tests/pom.xml | 4 +-
tests/e2e-tests/pom.xml | 2 +-
tests/extra-tests/pom.xml | 2 +-
tests/integration-tests/pom.xml | 2 +-
tests/jms-tests/pom.xml | 2 +-
tests/joram-tests/pom.xml | 2 +-
tests/karaf-client-integration-tests/pom.xml | 2 +-
tests/performance-jmh/pom.xml | 2 +-
tests/performance-tests/pom.xml | 2 +-
tests/pom.xml | 2 +-
tests/smoke-tests/pom.xml | 2 +-
tests/soak-tests/pom.xml | 2 +-
tests/stress-tests/pom.xml | 2 +-
tests/timing-tests/pom.xml | 2 +-
tests/unit-tests/pom.xml | 2 +-
231 files changed, 568 insertions(+), 229 deletions(-)
create mode 100644 artemis-cli/src/test/java/org/apache/activemq/cli/test/CliPerfClientTest.java
[activemq-artemis] 29/42: fix checkstyle on processor
Posted by cl...@apache.org.
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 a633cd2e7a84b06de9e1ba94392aad910398e5fc
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jul 21 16:26:05 2022 +0100
fix checkstyle on processor
---
.../java/org/apache/activemq/artemis/logprocessor/LogProcessor.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
index 5f077ab0cc..f7e2ed5279 100644
--- a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
+++ b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
@@ -42,7 +42,6 @@ import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.GetLogger;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
-import org.slf4j.helpers.MessageFormatter;
@SupportedAnnotationTypes({"org.apache.activemq.artemis.logprocessor.annotation.LogBundle"})
@SupportedSourceVersion(SourceVersion.RELEASE_11)
@@ -380,7 +379,7 @@ public class LogProcessor extends AbstractProcessor {
}
if (DEBUG) {
- debug("Parameter " + parameter + (isException? "is" : "is not") + " an exception");
+ debug("Parameter " + parameter + (isException ? "is" : "is not") + " an exception");
}
if (bundleAnnotation.enforceExceptionParameterAsLast() && isException && parameters.hasNext()) {
@@ -429,7 +428,7 @@ public class LogProcessor extends AbstractProcessor {
String formattingString = encodeSpecialChars(bundleAnnotation.projectCode() + messageAnnotation.id() + ": " + messageAnnotation.value());
if (exceptionParameter != null) {
writerOutput.println(" FormattingTuple output = org.slf4j.helpers.MessageFormatter.arrayFormat(\"" + formattingString + "\",new Object[] {" + callList + "});");
- writerOutput.println(" logger." + methodName + "(output.getMessage(), " + exceptionParameter.getSimpleName() +");");
+ writerOutput.println(" logger." + methodName + "(output.getMessage(), " + exceptionParameter.getSimpleName() + ");");
} else {
if (!hasParameters) {
writerOutput.println(" logger." + methodName + "(\"" + formattingString + "\");");
[activemq-artemis] 28/42: small tweak on test
Posted by cl...@apache.org.
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 6885cf1a06a1a0a6a24a85b47fb908f9b042676d
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Thu Jul 21 11:11:14 2022 -0400
small tweak on test
---
.../org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
index 8cc3cc5ddb..7d0a1eadf9 100644
--- a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
+++ b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
@@ -110,7 +110,7 @@ public class SimpleBundleTest {
try {
AssertionLoggerHandler.startCapture(false, false);
SimpleBundle.MESSAGES.outOfOrder(new MyException("ex1"), "2", "3", "4");
- Assert.assertFalse("parameter not found", AssertionLoggerHandler.findText("pex1"));
+ Assert.assertFalse("Exception should not be on the output", AssertionLoggerHandler.findText("pex1"));
Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p2"));
Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p3"));
Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p4"));
@@ -120,7 +120,7 @@ public class SimpleBundleTest {
AssertionLoggerHandler.startCapture(false, true);
SimpleBundle.MESSAGES.outOfOrder(createMyException("ex1"), "2", "3", "4");
- Assert.assertFalse("parameter not found", AssertionLoggerHandler.findText("pex1"));
+ Assert.assertFalse("Exception should not be on the output", AssertionLoggerHandler.findText("pex1"));
Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p3"));
Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p4"));
Assert.assertTrue("stack not found", AssertionLoggerHandler.findText("createMyException"));
[activemq-artemis] 15/42: fix various test failures due to unexpected message string; also make some tests indicate why they failed
Posted by cl...@apache.org.
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 61bc193f6393eedaa7f0b2c1c0c005f1ff1d8ae2
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jul 14 17:04:45 2022 +0100
fix various test failures due to unexpected message string; also make some tests indicate why they failed
---
.../artemis/core/server/ActiveMQMessageBundle.java | 4 ++--
.../integration/security/BasicSecurityManagerTest.java | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
index 8dd2f1fa82..5eb3b4d81e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
@@ -166,7 +166,7 @@ public interface ActiveMQMessageBundle {
@Message(id = 229031, value = "Unable to validate user from {}. Username: {}; SSL certificate subject DN: {}")
ActiveMQSecurityException unableToValidateUser(String remoteAddress, String user, String certMessage);
- @Message(id = 229032, value = "User: {} does not have permission=''{}'' on address {}")
+ @Message(id = 229032, value = "User: {} does not have permission='{}' on address {}")
ActiveMQSecurityException userNoPermissions(String username, CheckType checkType, SimpleString address);
@Message(id = 229033, value = "Server and client versions incompatible")
@@ -436,7 +436,7 @@ public interface ActiveMQMessageBundle {
@Message(id = 229212, value = "Invalid deletion policy type {}")
IllegalArgumentException invalidDeletionPolicyType(String val);
- @Message(id = 229213, value = "User: {} does not have permission=''{}'' for queue {} on address {}")
+ @Message(id = 229213, value = "User: {} does not have permission='{}' for queue {} on address {}")
ActiveMQSecurityException userNoPermissionsQueue(String username, CheckType checkType, SimpleString queue, SimpleString address);
@Message(id = 229214, value = "{} must be a valid percentage value between 0 and 100 or -1 (actual value: {})")
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/BasicSecurityManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/BasicSecurityManagerTest.java
index e4ea01350f..6a15cebc40 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/BasicSecurityManagerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/BasicSecurityManagerTest.java
@@ -193,7 +193,7 @@ public class BasicSecurityManagerTest extends ActiveMQTestBase {
session.createQueue(new QueueConfiguration(DURABLE_QUEUE).setAddress(ADDRESS));
Assert.fail("should throw exception here");
} catch (ActiveMQException e) {
- assertTrue(e.getMessage().contains("User: first does not have permission='CREATE_DURABLE_QUEUE' for queue durableQueue on address address"));
+ assertTrue("Unexpected exception message: " + e.getMessage(), e.getMessage().contains("User: first does not have permission='CREATE_DURABLE_QUEUE' for queue durableQueue on address address"));
}
// DELETE_DURABLE_QUEUE
@@ -201,7 +201,7 @@ public class BasicSecurityManagerTest extends ActiveMQTestBase {
session.deleteQueue(DURABLE_QUEUE);
Assert.fail("should throw exception here");
} catch (ActiveMQException e) {
- assertTrue(e.getMessage().contains("User: first does not have permission='DELETE_DURABLE_QUEUE' for queue durableQueue on address address"));
+ assertTrue("Unexpected exception message: " + e.getMessage(), e.getMessage().contains("User: first does not have permission='DELETE_DURABLE_QUEUE' for queue durableQueue on address address"));
}
// CREATE_NON_DURABLE_QUEUE
@@ -209,7 +209,7 @@ public class BasicSecurityManagerTest extends ActiveMQTestBase {
session.createQueue(new QueueConfiguration(NON_DURABLE_QUEUE).setAddress(ADDRESS).setDurable(false));
Assert.fail("should throw exception here");
} catch (ActiveMQException e) {
- assertTrue(e.getMessage().contains("User: first does not have permission='CREATE_NON_DURABLE_QUEUE' for queue nonDurableQueue on address address"));
+ assertTrue("Unexpected exception message: " + e.getMessage(), e.getMessage().contains("User: first does not have permission='CREATE_NON_DURABLE_QUEUE' for queue nonDurableQueue on address address"));
}
// DELETE_NON_DURABLE_QUEUE
@@ -217,7 +217,7 @@ public class BasicSecurityManagerTest extends ActiveMQTestBase {
session.deleteQueue(NON_DURABLE_QUEUE);
Assert.fail("should throw exception here");
} catch (ActiveMQException e) {
- assertTrue(e.getMessage().contains("User: first does not have permission='DELETE_NON_DURABLE_QUEUE' for queue nonDurableQueue on address address"));
+ assertTrue("Unexpected exception message: " + e.getMessage(), e.getMessage().contains("User: first does not have permission='DELETE_NON_DURABLE_QUEUE' for queue nonDurableQueue on address address"));
}
// PRODUCE
@@ -226,7 +226,7 @@ public class BasicSecurityManagerTest extends ActiveMQTestBase {
producer.send(session.createMessage(true));
Assert.fail("should throw exception here");
} catch (ActiveMQException e) {
- assertTrue(e.getMessage().contains("User: first does not have permission='SEND' on address address"));
+ assertTrue("Unexpected exception message: " + e.getMessage(), e.getMessage().contains("User: first does not have permission='SEND' on address address"));
}
// CONSUME
@@ -234,7 +234,7 @@ public class BasicSecurityManagerTest extends ActiveMQTestBase {
ClientConsumer consumer = session.createConsumer(DURABLE_QUEUE);
Assert.fail("should throw exception here");
} catch (ActiveMQException e) {
- assertTrue(e.getMessage().contains("User: first does not have permission='CONSUME' for queue durableQueue on address address"));
+ assertTrue("Unexpected exception message: " + e.getMessage(), e.getMessage().contains("User: first does not have permission='CONSUME' for queue durableQueue on address address"));
}
// MANAGE
@@ -243,7 +243,7 @@ public class BasicSecurityManagerTest extends ActiveMQTestBase {
producer.send(session.createMessage(true));
Assert.fail("should throw exception here");
} catch (ActiveMQException e) {
- assertTrue(e.getMessage().contains("User: first does not have permission='MANAGE' on address activemq.management"));
+ assertTrue("Unexpected exception message: " + e.getMessage(), e.getMessage().contains("User: first does not have permission='MANAGE' on address activemq.management"));
}
// BROWSE
@@ -251,7 +251,7 @@ public class BasicSecurityManagerTest extends ActiveMQTestBase {
ClientConsumer browser = session.createConsumer(DURABLE_QUEUE, true);
Assert.fail("should throw exception here");
} catch (ActiveMQException e) {
- assertTrue(e.getMessage().contains("User: first does not have permission='BROWSE' for queue durableQueue on address address"));
+ assertTrue("Unexpected exception message: " + e.getMessage(), e.getMessage().contains("User: first does not have permission='BROWSE' for queue durableQueue on address address"));
}
}
[activemq-artemis] 10/42: add some more needed deps; essentially every module with tests (or without specific log test config) will need this to avoid a stacktrace from logging setup issues
Posted by cl...@apache.org.
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 d1978ee438cef27236adb0c7e2e355b813c55348
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Jul 12 18:10:21 2022 +0100
add some more needed deps; essentially every module with tests (or without specific log test config) will need this to avoid a stacktrace from logging setup issues
---
artemis-protocols/artemis-hornetq-protocol/pom.xml | 6 ++++++
artemis-protocols/artemis-mqtt-protocol/pom.xml | 6 ++++++
artemis-protocols/artemis-openwire-protocol/pom.xml | 6 ++++++
artemis-protocols/artemis-stomp-protocol/pom.xml | 6 ++++++
4 files changed, 24 insertions(+)
diff --git a/artemis-protocols/artemis-hornetq-protocol/pom.xml b/artemis-protocols/artemis-hornetq-protocol/pom.xml
index 86e72fddf5..c412c85c28 100644
--- a/artemis-protocols/artemis-hornetq-protocol/pom.xml
+++ b/artemis-protocols/artemis-hornetq-protocol/pom.xml
@@ -79,6 +79,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/artemis-protocols/artemis-mqtt-protocol/pom.xml b/artemis-protocols/artemis-mqtt-protocol/pom.xml
index 5b6493e9e5..ebdffc8dd7 100644
--- a/artemis-protocols/artemis-mqtt-protocol/pom.xml
+++ b/artemis-protocols/artemis-mqtt-protocol/pom.xml
@@ -133,5 +133,11 @@
<scope>test</scope>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/artemis-protocols/artemis-openwire-protocol/pom.xml b/artemis-protocols/artemis-openwire-protocol/pom.xml
index 27b9950ab2..81fecfc7df 100644
--- a/artemis-protocols/artemis-openwire-protocol/pom.xml
+++ b/artemis-protocols/artemis-openwire-protocol/pom.xml
@@ -111,6 +111,12 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/artemis-protocols/artemis-stomp-protocol/pom.xml b/artemis-protocols/artemis-stomp-protocol/pom.xml
index 69ffa8fcd1..c902a8df29 100644
--- a/artemis-protocols/artemis-stomp-protocol/pom.xml
+++ b/artemis-protocols/artemis-stomp-protocol/pom.xml
@@ -82,5 +82,11 @@
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
[activemq-artemis] 13/42: fix test missed in prior change
Posted by cl...@apache.org.
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 de66f8f0251a2ab7949dd39ab5a4226c8b078071
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Jul 13 18:52:52 2022 +0100
fix test missed in prior change
---
.../activemq/artemis/logprocessor/SimpleBundleTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
index 8dc4643a16..424538da4c 100644
--- a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
+++ b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
@@ -26,25 +26,25 @@ public class SimpleBundleTest {
@Test
public void testSimple() {
- Assert.assertEquals("TST1 Test", SimpleBundle.MESSAGES.simpleTest());
+ Assert.assertEquals("TST1: Test", SimpleBundle.MESSAGES.simpleTest());
System.out.println(SimpleBundle.MESSAGES.simpleTest());
}
@Test
public void testParameters() {
- Assert.assertEquals("TST2 V1-bb", SimpleBundle.MESSAGES.parameters(1, "bb"));
+ Assert.assertEquals("TST2: V1-bb", SimpleBundle.MESSAGES.parameters(1, "bb"));
}
@Test
public void testException() {
Exception ex = SimpleBundle.MESSAGES.someException();
- Assert.assertEquals("TST3 EX", ex.getMessage());
+ Assert.assertEquals("TST3: EX", ex.getMessage());
}
@Test
public void testSomeExceptionParameter() {
String uuid = UUID.randomUUID().toString();
- Assert.assertEquals(new Exception("TST4 EX-" + uuid).toString(), SimpleBundle.MESSAGES.someExceptionParameter(uuid).toString());
+ Assert.assertEquals(new Exception("TST4: EX-" + uuid).toString(), SimpleBundle.MESSAGES.someExceptionParameter(uuid).toString());
}
@Test
@@ -66,20 +66,20 @@ public class SimpleBundleTest {
Exception myCause = new Exception("this is myCause");
String logRandomString = "" + System.currentTimeMillis();
MyException myException = SimpleBundle.MESSAGES.someExceptionWithCause(logRandomString, myCause);
- Assert.assertEquals("TST8 EX" + logRandomString, myException.getMessage());
+ Assert.assertEquals("TST8: EX" + logRandomString, myException.getMessage());
Assert.assertSame(myCause, myException.getCause());
}
@Test
public void testABCD() {
System.out.println(SimpleBundle.MESSAGES.abcd("A", "B", "C", "D"));
- Assert.assertEquals("TST9 A B C D", SimpleBundle.MESSAGES.abcd("A", "B", "C", "D"));
+ Assert.assertEquals("TST9: A B C D", SimpleBundle.MESSAGES.abcd("A", "B", "C", "D"));
}
@Test
public void testObjectsABCD() {
System.out.println(SimpleBundle.MESSAGES.abcd("A", "B", "C", "D"));
- Assert.assertEquals("TST10 A B C D", SimpleBundle.MESSAGES.objectsAbcd(new MyObject("A"), new MyObject("B"), new MyObject("C"), new MyObject("D")));
+ Assert.assertEquals("TST10: A B C D", SimpleBundle.MESSAGES.objectsAbcd(new MyObject("A"), new MyObject("B"), new MyObject("C"), new MyObject("D")));
}
[activemq-artemis] 14/42: temporarily remove test to allow concentrating on other issues
Posted by cl...@apache.org.
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 be9168c7b434c0bf8c0b16fdf8b9d639475592db
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jul 14 16:12:23 2022 +0100
temporarily remove test to allow concentrating on other issues
---
.../security/NettySecurityClientTest.java | 92 ----------------------
.../resources/restricted-security-client.policy | 84 --------------------
2 files changed, 176 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/NettySecurityClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/NettySecurityClientTest.java
deleted file mode 100644
index 378b40f2d6..0000000000
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/NettySecurityClientTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.integration.security;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLDecoder;
-
-import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.tests.util.SpawnedTestBase;
-import org.apache.activemq.artemis.utils.SpawnedVMSupport;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class NettySecurityClientTest extends SpawnedTestBase {
-
- private ActiveMQServer messagingService;
-
- @Test
- public void testProducerConsumerClientWithoutSecurityManager() throws Exception {
- doTestProducerConsumerClient(false);
- }
-
- @Test
- public void testProducerConsumerClientWithSecurityManager() throws Exception {
- doTestProducerConsumerClient(true);
- }
-
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
-
- ConfigurationImpl config = createBasicConfig().addAcceptorConfiguration(getNettyAcceptorTransportConfiguration(true));
- messagingService = createServer(false, config);
- messagingService.start();
- waitForServerToStart(messagingService);
- }
-
- private void doTestProducerConsumerClient(final boolean withSecurityManager) throws Exception {
- String[] vmargs = new String[0];
- if (withSecurityManager) {
- URL securityPolicyURL = Thread.currentThread().getContextClassLoader().getResource("restricted-security-client.policy");
- vmargs = new String[]{"-Djava.security.manager", "-Djava.security.policy=" + URLDecoder.decode(securityPolicyURL.getPath(), "UTF-8")};
- }
-
- // spawn a JVM that creates a client with a security manager which sends and receives a
- // test message
- Process p = SpawnedVMSupport.spawnVM(SimpleClient.class.getName(), "-Xms512m", "-Xmx512m", vmargs, true, true, false, new String[]{NETTY_CONNECTOR_FACTORY});
-
- InputStreamReader isr = new InputStreamReader(p.getInputStream());
-
- BufferedReader br = new BufferedReader(isr);
- String line = null;
- while ((line = br.readLine()) != null) {
- line = line.replace('|', '\n');
- if (line.startsWith("Listening")) {
- continue;
- } else if ("OK".equals(line.trim())) {
- break;
- } else {
- //Assert.fail("Exception when starting the client: " + line);
- System.out.println(line);
- }
- }
-
- SpawnedVMSupport.startLogger(SimpleClient.class.getName(), p);
-
- // the client VM should exit by itself. If it doesn't, that means we have a problem
- // and the test will timeout
- p.waitFor();
-
- Assert.assertEquals("client VM did not exit cleanly", 0, p.exitValue());
- }
-}
diff --git a/tests/integration-tests/src/test/resources/restricted-security-client.policy b/tests/integration-tests/src/test/resources/restricted-security-client.policy
deleted file mode 100644
index 45ea5298ba..0000000000
--- a/tests/integration-tests/src/test/resources/restricted-security-client.policy
+++ /dev/null
@@ -1,84 +0,0 @@
-// 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.
-//
-grant {
- // --------------------------------------------------------------------------------
- // SEE http://docs.oracle.com/javase/1.4.2/docs/guide/security/permissions.html
- // --------------------------------------------------------------------------------
-
-
- // allow to connect to localhost
- permission java.net.SocketPermission "*:1024-", "connect";
- // Note1: normally, we don't need this permission since the applet allows reading jars loaded by the applet
- // Note2: Which of the following two java.io.FilePermission is necessary depends on the exact Maven command
- permission java.io.FilePermission "/etc/os-release", "read";
- permission java.io.FilePermission "/usr/lib/os-release", "read";
- permission java.io.FilePermission "${activemq.basedir}/artemis-core-client/target/classes/-", "read";
- permission java.io.FilePermission "${activemq.basedir}/artemis-core-client/target/artemis-core-client-${project.version}.jar", "read";
- permission java.util.PropertyPermission "activemq.version.property.filename", "read";
- permission java.util.PropertyPermission "activemq.artemis.client.global.thread.pool.max.size", "read";
- permission java.util.PropertyPermission "activemq.artemis.client.global.scheduled.thread.pool.core.size", "read";
- permission java.util.PropertyPermission "io.netty.eventLoopThreads", "read";
- permission java.util.PropertyPermission "io.netty.maxThreadLocalCharBufferSize", "read";
- permission java.util.PropertyPermission "io.netty.batch.bytes", "read";
- permission java.util.PropertyPermission "com.ibm.vm.bitmode", "read";
- permission java.util.PropertyPermission "io.netty.noUnsafe", "read";
- permission java.util.PropertyPermission "io.netty.tryUnsafe", "read";
- permission java.util.PropertyPermission "org.jboss.netty.tryUnsafe", "read";
- permission java.util.PropertyPermission "io.netty.noJavassist", "read";
- permission java.util.PropertyPermission "io.netty.noKeySetOptimization", "read";
- permission java.util.PropertyPermission "io.netty.selectorAutoRebuildThreshold", "read";
- permission java.util.PropertyPermission "io.netty.initialSeedUniquifier", "read";
- permission java.util.PropertyPermission "io.netty.noResourceLeakDetection", "read";
- permission java.util.PropertyPermission "io.netty.tmpdir", "read";
- permission java.util.PropertyPermission "io.netty.bitMode", "read";
- permission java.util.PropertyPermission "io.netty.leakDetectionLevel", "read";
- permission java.util.PropertyPermission "io.netty.allocator.pageSize", "read";
- permission java.util.PropertyPermission "io.netty.allocator.maxOrder", "read";
- permission java.util.PropertyPermission "io.netty.allocator.numHeapArenas", "read";
- permission java.util.PropertyPermission "io.netty.allocator.numDirectArenas", "read";
- permission java.util.PropertyPermission "io.netty.allocator.tinyCacheSize", "read";
- permission java.util.PropertyPermission "io.netty.allocator.smallCacheSize", "read";
- permission java.util.PropertyPermission "io.netty.allocator.normalCacheSize", "read";
- permission java.util.PropertyPermission "io.netty.allocator.maxCachedBufferCapacity", "read";
- permission java.util.PropertyPermission "io.netty.allocator.cacheTrimInterval", "read";
- permission java.util.PropertyPermission "io.netty.allocator.type", "read";
- permission java.util.PropertyPermission "io.netty.threadLocalDirectBufferSize", "read";
- permission java.util.PropertyPermission "io.netty.recycler.maxCapacity.default", "read";
- permission java.util.PropertyPermission "java.io.tmpdir", "read";
- permission java.util.PropertyPermission "sun.arch.data.model", "read";
- permission java.util.PropertyPermission "sun.nio.ch.bugLevel", "read";
- permission java.util.PropertyPermission "io.netty.leakDetection.level", "read";
- permission java.util.PropertyPermission "io.netty.leakDetection.maxRecords", "read";
-
- permission java.util.PropertyPermission "java.util.secureRandomSeed", "read";
- permission java.util.PropertyPermission "io.netty.initialSeedUniquifier", "read";
- permission java.util.PropertyPermission "io.netty.maxDirectMemory", "read";
- permission java.util.PropertyPermission "io.netty.eventexecutor.maxPendingTasks", "read";
- permission java.util.PropertyPermission "io.netty.defaultPromise.maxListenerStackDepth", "read";
- permission java.util.PropertyPermission "io.netty.eventLoop.maxPendingTasks", "read";
- permission java.util.PropertyPermission "io.netty.processId", "read";
- permission java.util.PropertyPermission "io.netty.machineId", "read";
- permission java.util.PropertyPermission "java.net.preferIPv4Stack", "read";
- permission java.util.PropertyPermission "java.net.preferIPv6Addresses", "read";
- permission java.util.PropertyPermission "jctools.cacheLineSize", "read";
- permission java.util.PropertyPermission "org.jboss.logging.locale", "read";
-
- permission java.lang.RuntimePermission "setContextClassLoader";
- permission java.lang.RuntimePermission "accessDeclaredMembers";
- permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
-
- permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-};
[activemq-artemis] 19/42: switch to released 2.0.0 artemis-native dep
Posted by cl...@apache.org.
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 b05159b850b6139a1c56a46379d332430f61dfb2
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 15 09:01:01 2022 +0100
switch to released 2.0.0 artemis-native dep
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index eb040b14c9..8415fb959d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<logging.config>log4j2-tests-config.properties</logging.config>
<modular.jdk.surefire.arg>--add-modules java.sql,jdk.unsupported </modular.jdk.surefire.arg>
- <activemq-artemis-native-version>2.1.0-SNAPSHOT</activemq-artemis-native-version>
+ <activemq-artemis-native-version>2.0.0</activemq-artemis-native-version>
<karaf.version>4.3.3</karaf.version>
<pax.exam.version>4.13.4</pax.exam.version>
<commons.config.version>2.8.0</commons.config.version>
[activemq-artemis] 03/42: make a start on restoring AssertionLoggerHandler to get tests going
Posted by cl...@apache.org.
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 8816ef28b855945f5f7467a1c66efa101e95f961
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Jul 6 17:32:47 2022 +0100
make a start on restoring AssertionLoggerHandler to get tests going
---
.../artemis/logs/AssertionLoggerHandler.java | 68 -------
artemis-journal/pom.xml | 6 +
artemis-unit-test-support/pom.xml | 5 +
.../artemis/logs/AssertionLoggerHandler.java | 224 +++++++++++++++++++++
.../integration/server/SimpleStartStopTest.java | 5 +-
5 files changed, 237 insertions(+), 71 deletions(-)
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
deleted file mode 100644
index ca41f1bf37..0000000000
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.logs;
-
-import java.util.logging.Level;
-
-
-public class AssertionLoggerHandler {
-
- public void close() throws SecurityException {
- }
-
- public static boolean hasLevel(Level level) {
- return false;
- }
-
- public static boolean findText(long mstimeout, String... text) {
- return false;
- }
-
- /**
- * Find a line that contains the parameters passed as an argument
- *
- * @param text
- * @return
- */
- public static boolean findText(final String... text) {
- return false;
- }
-
- public static int countText(final String... text) {
- return 0;
- }
-
- public static boolean matchText(final String pattern) {
- return false;
- }
-
- public static final void clear() {
- }
-
- public static final void startCapture() {
- }
-
- /**
- *
- * @param individualMessages enables counting individual messages.
- */
- public static final void startCapture(boolean individualMessages) {
- }
-
- public static final void stopCapture() {
- }
-}
diff --git a/artemis-journal/pom.xml b/artemis-journal/pom.xml
index eb5d67cf42..7e00b98edf 100644
--- a/artemis-journal/pom.xml
+++ b/artemis-journal/pom.xml
@@ -89,5 +89,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/artemis-unit-test-support/pom.xml b/artemis-unit-test-support/pom.xml
index 8910ebde18..69727cd33b 100644
--- a/artemis-unit-test-support/pom.xml
+++ b/artemis-unit-test-support/pom.xml
@@ -41,5 +41,10 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
new file mode 100644
index 0000000000..4bb25932f2
--- /dev/null
+++ b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
@@ -0,0 +1,224 @@
+/*
+ * 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.logs;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.config.Property;
+
+/**
+ * This class contains a tool where programs could intercept for LogMessage given an interval of time between {@link #startCapture()}
+ * and {@link #stopCapture()}
+ *
+ * Be careful with this use as this is intended for testing only (such as testcases)
+ */
+public class AssertionLoggerHandler extends AbstractAppender {
+
+ public enum LogLevel {
+ ERROR(Level.ERROR),
+ WARN(Level.WARN),
+ INFO(Level.INFO),
+ DEBUG(Level.DEBUG),
+ TRACE(Level.TRACE);
+
+ Level implLevel;
+
+ private LogLevel(Level implLevel) {
+ this.implLevel = implLevel;
+ }
+
+ private Level toImplLevel() {
+ return implLevel;
+ }
+ }
+
+ private static final Map<String, LogEvent> messages = new ConcurrentHashMap<>();
+ private static List<String> traceMessages;
+ private static volatile boolean capture = false;
+
+ protected AssertionLoggerHandler(String name, Filter filter, Layout<? extends Serializable> layout, boolean ignoreExceptions, Property[] properties) {
+ super(name, filter, layout, ignoreExceptions, properties);
+ }
+
+ @Override
+ public void append(LogEvent event) {
+ if (capture) {
+ //TODO: see getFormattedMessage() around handling StringBuilderFormattable interface as well, check it out
+ String formattedMessage = event.getMessage().getFormattedMessage();
+ messages.put(formattedMessage, event);
+ if (traceMessages != null) {
+ traceMessages.add(formattedMessage);
+ }
+ }
+ }
+
+ @Override
+ public void stop() {
+ super.stop();
+ // TODO Do we need to do anything here? Set capture false and clear?
+ }
+
+ /**
+ * is there any record matching Level?
+ *
+ * @param level
+ * @return
+ */
+ public static boolean hasLevel(LogLevel level) {
+ Level implLevel = level.toImplLevel();
+
+ for (LogEvent event : messages.values()) {
+ if (implLevel.equals(event.getLevel())) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public static boolean findText(long mstimeout, String... text) {
+
+ long timeMax = System.currentTimeMillis() + mstimeout;
+ do {
+ if (findText(text)) {
+ return true;
+ }
+ }
+ while (timeMax > System.currentTimeMillis());
+
+ return false;
+
+ }
+
+ /**
+ * Find a line that contains the parameters passed as an argument
+ *
+ * @param text
+ * @return
+ */
+ public static boolean findText(final String... text) {
+ for (Map.Entry<String, LogEvent> entry : messages.entrySet()) {
+ String key = entry.getKey();
+ boolean found = true;
+
+ for (String txtCheck : text) {
+ found = key.contains(txtCheck);
+ if (!found) {
+ // If the main log message doesn't contain what we're looking for let's look in the message from the exception (if there is one).
+ Throwable throwable = entry.getValue().getThrown();
+ if (throwable != null && throwable.getMessage() != null) {
+ found = throwable.getMessage().contains(txtCheck);
+ if (!found) {
+ break;
+ }
+ } else {
+ break;
+ }
+ }
+ }
+
+ if (found) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public static int countText(final String... text) {
+ int found = 0;
+ if (traceMessages != null) {
+ for (String str : traceMessages) {
+ for (String txtCheck : text) {
+ if (str.contains(txtCheck)) {
+ found++;
+ }
+ }
+ }
+ } else {
+ for (Map.Entry<String, LogEvent> entry : messages.entrySet()) {
+ String key = entry.getKey();
+
+ for (String txtCheck : text) {
+ if (key.contains(txtCheck)) {
+ found++;
+ }
+ }
+ }
+ }
+
+ return found;
+ }
+
+ public static boolean matchText(final String pattern) {
+ Pattern r = Pattern.compile(pattern);
+
+ for (Map.Entry<String, LogEvent> entry : messages.entrySet()) {
+ if (r.matcher(entry.getKey()).matches()) {
+ return true;
+ } else {
+ Throwable throwable = entry.getValue().getThrown();
+ if (throwable != null && throwable.getMessage() != null) {
+ if (r.matcher(throwable.getMessage()).matches()) {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
+ public static final void clear() {
+ messages.clear();
+ if (traceMessages != null) {
+ traceMessages.clear();
+ }
+ }
+
+ public static final void startCapture() {
+ startCapture(false);
+ }
+
+ /**
+ *
+ * @param individualMessages enables counting individual messages.
+ */
+ public static final void startCapture(boolean individualMessages) {
+ clear();
+ if (individualMessages) {
+ traceMessages = new LinkedList<>();
+ }
+ capture = true;
+ }
+
+ public static final void stopCapture() {
+ capture = false;
+ clear();
+ traceMessages = null;
+ }
+}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java
index 9b375ebe5d..f4b0a4a80f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java
@@ -23,11 +23,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
+import org.apache.activemq.artemis.logs.AssertionLoggerHandler.LogLevel;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.junit.Ignore;
import org.junit.Test;
-@Ignore("Needs updated to account for logging impl changes") //TODO: reinstate
public class SimpleStartStopTest extends ActiveMQTestBase {
/**
@@ -52,7 +51,7 @@ public class SimpleStartStopTest extends ActiveMQTestBase {
}
// There shouldn't be any error from starting / stopping the server
- //TODO: assertFalse("There shouldn't be any error for just starting / stopping the server", AssertionLoggerHandler.hasLevel(Level.ERROR));
+ assertFalse("There shouldn't be any error for just starting / stopping the server", AssertionLoggerHandler.hasLevel(LogLevel.ERROR));
assertFalse(AssertionLoggerHandler.findText("AMQ224008"));
HashMap<Integer, AtomicInteger> records = this.internalCountJournalLivingRecords(server.getConfiguration(), false);
[activemq-artemis] 01/42: squashed logging changes from Clebert + me, rebased onto main at 688b894c6205058c24d225b340aea1d8a5599902
Posted by cl...@apache.org.
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 3d200b32da2e92cbb8db37825d9bfe57919c27f4
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jun 27 12:55:13 2022 +0100
squashed logging changes from Clebert + me, rebased onto main at 688b894c6205058c24d225b340aea1d8a5599902
---
.github/workflows/build.yml | 2 +
.travis.yml | 33 -
artemis-cdi-client/pom.xml | 26 +-
.../client/cdi/logger/ActiveMQCDILogger.java | 26 +-
artemis-cli/pom.xml | 19 +-
.../artemis/cli/commands/Configurable.java | 9 +-
.../cli/commands/tools/xml/XMLMessageImporter.java | 5 +-
.../cli/commands/tools/xml/XmlDataExporter.java | 21 +-
.../cli/commands/tools/xml/XmlDataImporter.java | 7 +-
.../bootstrap/ActiveMQBootstrapLogger.java | 49 +-
.../org/apache/activemq/cli/test/ArtemisTest.java | 41 +-
.../org/apache/activemq/cli/test/HashUtilTest.java | 7 +-
artemis-commons/pom.xml | 33 +-
.../core/server/ActiveMQScheduledComponent.java | 7 +-
.../artemis/core/server/NetworkHealthCheck.java | 7 +-
.../activemq/artemis/logs/ActiveMQUtilBundle.java | 22 +-
.../activemq/artemis/logs/ActiveMQUtilLogger.java | 106 +-
.../artemis/logs/AssertionLoggerHandler.java | 138 +-
.../apache/activemq/artemis/logs/AuditLogger.java | 1846 ++++++++------------
.../logs/JBossLoggingApacheLoggerBridge.java | 134 --
.../apache/activemq/artemis/utils/ByteUtil.java | 2 +-
.../activemq/artemis/utils/ClassloadingUtil.java | 7 +-
.../artemis/utils/DefaultSensitiveStringCodec.java | 5 +-
.../activemq/artemis/utils/SizeAwareMetric.java | 5 +-
.../activemq/artemis/utils/SpawnedVMSupport.java | 5 +-
.../activemq/artemis/utils/ThreadDumpUtil.java | 6 +-
.../apache/activemq/artemis/utils/UTF8Util.java | 13 +-
.../activemq/artemis/utils/UUIDGenerator.java | 13 +-
.../artemis/utils/actors/OrderedExecutor.java | 5 +-
.../artemis/utils/actors/ProcessorBase.java | 5 +-
.../artemis/utils/actors/ThresholdActor.java | 5 +-
.../utils/collections/ConcurrentLongHashSet.java | 5 +-
.../utils/critical/CriticalAnalyzerImpl.java | 5 +-
.../artemis/utils/critical/CriticalMeasure.java | 5 +-
.../FluentPropertyBeanIntrospectorWithIgnores.java | 5 +-
.../activemq/artemis/utils/ByteUtilTest.java | 5 +-
.../utils/DefaultSensitiveStringCodecTest.java | 5 +-
.../utils/actors/OrderedExecutorSanityTest.java | 5 +-
.../critical/MultiThreadCriticalMeasureTest.java | 5 +-
artemis-core-client-osgi/pom.xml | 31 +-
artemis-core-client/pom.xml | 32 +-
.../api/config/ActiveMQDefaultConfiguration.java | 7 +-
.../api/core/ChannelBroadcastEndpointFactory.java | 5 +-
.../artemis/api/core/JGroupsBroadcastEndpoint.java | 5 +-
.../artemis/api/core/jgroups/JChannelManager.java | 5 +-
.../artemis/api/core/jgroups/JChannelWrapper.java | 5 +-
.../artemis/api/core/jgroups/JGroupsReceiver.java | 5 +-
.../artemis/core/client/ActiveMQClientLogger.java | 456 ++---
.../core/client/ActiveMQClientMessageBundle.java | 52 +-
.../core/client/impl/ClientConsumerImpl.java | 5 +-
.../core/client/impl/ClientProducerImpl.java | 9 +-
.../core/client/impl/ClientSessionFactoryImpl.java | 7 +-
.../core/client/impl/ClientSessionImpl.java | 7 +-
.../core/client/impl/ServerLocatorImpl.java | 5 +-
.../artemis/core/client/impl/Topology.java | 9 +-
.../artemis/core/cluster/DiscoveryGroup.java | 7 +-
.../artemis/core/message/impl/CoreMessage.java | 5 +-
.../message/openmbean/MessageOpenTypeFactory.java | 5 +-
.../core/impl/ActiveMQClientProtocolManager.java | 5 +-
.../protocol/core/impl/ActiveMQSessionContext.java | 13 +-
.../core/protocol/core/impl/ChannelImpl.java | 5 +-
.../protocol/core/impl/RemotingConnectionImpl.java | 5 +-
.../artemis/core/remoting/CertificateUtil.java | 5 +-
.../remoting/impl/netty/CheckDependencies.java | 5 +-
.../core/remoting/impl/netty/NettyConnection.java | 5 +-
.../core/remoting/impl/netty/NettyConnector.java | 17 +-
.../remoting/impl/netty/TransportConstants.java | 7 +-
.../impl/ssl/DefaultOpenSSLContextFactory.java | 4 +-
.../impl/ssl/DefaultSSLContextFactory.java | 2 +-
.../core/protocol/AbstractRemotingConnection.java | 5 +-
.../core/remoting/ssl/OpenSSLContextFactory.java | 5 +-
.../spi/core/remoting/ssl/SSLContextFactory.java | 5 +-
.../activemq/artemis/utils/AutoCreateUtil.java | 7 +-
.../org/apache/activemq/artemis/utils/XMLUtil.java | 5 +-
...nnectorTransportConfigurationParserURITest.java | 5 +-
artemis-features/src/main/resources/features.xml | 4 +-
artemis-jakarta-client/pom.xml | 21 +-
artemis-jakarta-ra/pom.xml | 22 +-
artemis-jakarta-server/pom.xml | 20 +-
artemis-jakarta-service-extensions/pom.xml | 28 +-
artemis-jdbc-store/pom.xml | 21 +-
.../jdbc/store/drivers/AbstractJDBCDriver.java | 35 +-
.../jdbc/store/drivers/JDBCConnectionProvider.java | 14 +-
.../artemis/jdbc/store/drivers/JDBCUtils.java | 11 +-
.../jdbc/store/file/JDBCSequentialFile.java | 5 +-
.../jdbc/store/file/JDBCSequentialFileFactory.java | 8 +-
.../file/JDBCSequentialFileFactoryDriver.java | 7 +-
.../jdbc/store/journal/JDBCJournalImpl.java | 7 +-
.../jdbc/store/journal/JDBCJournalRecord.java | 7 +-
.../jdbc/store/logging/LoggingConnection.java | 112 +-
.../store/logging/LoggingPreparedStatement.java | 118 +-
.../jdbc/store/logging/LoggingResultSet.java | 395 +++--
.../jdbc/store/logging/LoggingStatement.java | 108 +-
.../jdbc/store/sql/PropertySQLProvider.java | 11 +-
artemis-jms-client-osgi/pom.xml | 31 +-
artemis-jms-client/pom.xml | 22 +-
.../artemis/api/jms/ActiveMQJMSClient.java | 7 +-
.../jms/client/ActiveMQJMSClientBundle.java | 23 +-
.../jms/client/ActiveMQJMSClientLogger.java | 43 +-
.../jms/client/ActiveMQMessageProducer.java | 5 +-
.../org/apache/activemq/artemis/uri/TCPSchema.java | 7 +-
.../artemis/uri/ConnectionFactoryURITest.java | 7 +-
artemis-jms-server/pom.xml | 18 +-
.../jms/bridge/ActiveMQJMSBridgeLogger.java | 81 +-
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 318 ++--
.../jms/server/ActiveMQJMSServerBundle.java | 24 +-
.../jms/server/ActiveMQJMSServerLogger.java | 88 +-
artemis-journal/pom.xml | 36 +-
.../artemis/core/io/AbstractSequentialFile.java | 7 +-
.../core/io/AbstractSequentialFileFactory.java | 5 +-
.../activemq/artemis/core/io/RunnableCallback.java | 5 +-
.../artemis/core/io/aio/AIOSequentialFile.java | 10 +-
.../core/io/aio/AIOSequentialFileFactory.java | 19 +-
.../artemis/core/io/buffer/TimedBuffer.java | 7 +-
.../artemis/core/io/mapped/MappedFile.java | 5 +-
.../artemis/core/io/nio/NIOSequentialFile.java | 9 +-
.../activemq/artemis/core/io/util/FileIOUtil.java | 5 +-
.../core/journal/impl/JournalCompactor.java | 5 +-
.../artemis/core/journal/impl/JournalFileImpl.java | 5 +-
.../core/journal/impl/JournalFilesRepository.java | 13 +-
.../artemis/core/journal/impl/JournalImpl.java | 13 +-
.../core/journal/impl/JournalTransaction.java | 5 +-
.../artemis/core/journal/impl/Reclaimer.java | 15 +-
.../artemis/journal/ActiveMQJournalBundle.java | 14 +-
.../artemis/journal/ActiveMQJournalLogger.java | 218 +--
.../apache/activemq/artemis/core/TestDeleteme.java | 29 +-
artemis-junit/pom.xml | 14 +-
artemis-log-facade/pom.xml | 78 +
.../activemq/artemis/logprocessor/CodeFactory.java | 69 +
artemis-log-processor/pom.xml | 83 +
.../artemis/logprocessor/LogProcessor.java | 402 +++++
.../artemis/logprocessor/annotation/Cause.java | 28 +-
.../artemis/logprocessor/annotation/GetLogger.java | 28 +-
.../artemis/logprocessor/annotation/LogBundle.java | 30 +-
.../logprocessor/annotation/LogMessage.java | 45 +-
.../artemis/logprocessor/annotation/Message.java | 32 +-
.../services/javax.annotation.processing.Processor | 1 +
.../activemq/artemis/logprocessor/MyException.java | 30 +-
.../activemq/artemis/logprocessor/MyObject.java | 31 +-
.../artemis/logprocessor/SimpleBundle.java | 63 +
.../artemis/logprocessor/SimpleBundleTest.java | 90 +
artemis-protocols/artemis-amqp-protocol/pom.xml | 33 +-
.../amqp/broker/AMQPConnectionCallback.java | 5 +-
.../amqp/broker/AMQPLargeMessagePersister.java | 2 -
.../artemis/protocol/amqp/broker/AMQPMessage.java | 5 +-
.../protocol/amqp/broker/AMQPSessionCallback.java | 5 +-
.../amqp/broker/ProtonProtocolManager.java | 7 +-
.../amqp/client/ProtonClientConnectionManager.java | 17 +-
.../amqp/connect/AMQPBrokerConnection.java | 11 +-
.../amqp/connect/AMQPBrokerConnectionManager.java | 5 +-
.../connect/mirror/AMQPMirrorControllerSource.java | 5 +-
.../connect/mirror/AMQPMirrorControllerTarget.java | 11 +-
.../amqp/connect/mirror/MirrorTransaction.java | 7 +-
.../protocol/amqp/converter/CoreAmqpConverter.java | 3 -
.../converter/coreWrapper/CoreMessageWrapper.java | 7 +-
.../amqp/logger/ActiveMQAMQPProtocolLogger.java | 45 +-
.../logger/ActiveMQAMQPProtocolMessageBundle.java | 50 +-
.../amqp/proton/AMQPConnectionContext.java | 5 +-
.../protocol/amqp/proton/AMQPSessionContext.java | 5 +-
.../amqp/proton/ProtonServerReceiverContext.java | 9 +-
.../amqp/proton/ProtonServerSenderContext.java | 11 +-
.../amqp/proton/handler/ProtonHandler.java | 19 +-
.../transaction/ProtonTransactionHandler.java | 5 +-
.../amqp/sasl/ExternalServerSASLFactory.java | 5 +-
.../protocol/amqp/sasl/GSSAPIServerSASL.java | 7 +-
.../amqp/sasl/GSSAPIServerSASLFactory.java | 5 +-
.../amqp/sasl/scram/SCRAMServerSASLFactory.java | 5 +-
.../protocol/amqp/converter/TestConversions.java | 5 +-
artemis-protocols/artemis-mqtt-protocol/pom.xml | 18 +-
.../core/protocol/mqtt/MQTTConnectionManager.java | 3 -
.../artemis/core/protocol/mqtt/MQTTLogger.java | 44 +-
.../core/protocol/mqtt/MQTTProtocolHandler.java | 9 +-
.../core/protocol/mqtt/MQTTProtocolManager.java | 16 +-
.../core/protocol/mqtt/MQTTPublishManager.java | 13 +-
.../protocol/mqtt/MQTTRetainMessageManager.java | 2 -
.../artemis/core/protocol/mqtt/MQTTSession.java | 9 +-
.../core/protocol/mqtt/MQTTSessionCallback.java | 3 -
.../core/protocol/mqtt/MQTTSessionState.java | 7 +-
.../protocol/mqtt/MQTTSubscriptionManager.java | 3 -
.../artemis/core/protocol/mqtt/MQTTUtil.java | 5 +-
.../mqtt/MQTTRetainMessageManagerTest.java | 19 +-
.../core/protocol/mqtt/MqttClientService.java | 15 +-
.../artemis-openwire-protocol/pom.xml | 12 +-
.../core/protocol/openwire/OpenWireConnection.java | 44 +-
.../protocol/openwire/OpenWireProtocolManager.java | 7 +-
.../core/protocol/openwire/amq/AMQConsumer.java | 7 +-
.../core/protocol/openwire/amq/AMQSession.java | 16 +-
artemis-protocols/artemis-stomp-protocol/pom.xml | 18 +-
.../stomp/ActiveMQStompProtocolLogger.java | 28 +-
.../stomp/ActiveMQStompProtocolMessageBundle.java | 52 +-
.../core/protocol/stomp/StompConnection.java | 7 +-
.../core/protocol/stomp/StompProtocolManager.java | 5 +-
.../artemis/core/protocol/stomp/StompSession.java | 9 +-
.../protocol/stomp/v11/StompFrameHandlerV11.java | 9 +-
artemis-quorum-ri/pom.xml | 27 +-
artemis-ra/pom.xml | 33 +-
.../activemq/artemis/ra/ActiveMQRABundle.java | 18 +-
.../artemis/ra/ActiveMQRABytesMessage.java | 117 +-
.../ra/ActiveMQRAConnectionFactoryImpl.java | 120 +-
.../artemis/ra/ActiveMQRAConnectionManager.java | 17 +-
.../artemis/ra/ActiveMQRAConnectionMetaData.java | 37 +-
.../ra/ActiveMQRAConnectionRequestInfo.java | 61 +-
.../activemq/artemis/ra/ActiveMQRACredential.java | 45 +-
.../artemis/ra/ActiveMQRALocalTransaction.java | 21 +-
.../activemq/artemis/ra/ActiveMQRALogger.java | 112 +-
.../artemis/ra/ActiveMQRAMCFProperties.java | 33 +-
.../artemis/ra/ActiveMQRAManagedConnection.java | 67 +-
.../ra/ActiveMQRAManagedConnectionFactory.java | 100 +-
.../activemq/artemis/ra/ActiveMQRAMapMessage.java | 109 +-
.../activemq/artemis/ra/ActiveMQRAMessage.java | 217 +--
.../artemis/ra/ActiveMQRAMessageConsumer.java | 61 +-
.../artemis/ra/ActiveMQRAMessageListener.java | 14 +-
.../artemis/ra/ActiveMQRAMessageProducer.java | 113 +-
.../activemq/artemis/ra/ActiveMQRAMetaData.java | 25 +-
.../artemis/ra/ActiveMQRAObjectMessage.java | 17 +-
.../activemq/artemis/ra/ActiveMQRAProperties.java | 32 +-
.../artemis/ra/ActiveMQRAQueueReceiver.java | 13 +-
.../activemq/artemis/ra/ActiveMQRAQueueSender.java | 29 +-
.../activemq/artemis/ra/ActiveMQRASession.java | 352 ++--
.../artemis/ra/ActiveMQRASessionFactoryImpl.java | 151 +-
.../artemis/ra/ActiveMQRAStreamMessage.java | 105 +-
.../activemq/artemis/ra/ActiveMQRATextMessage.java | 17 +-
.../artemis/ra/ActiveMQRATopicPublisher.java | 45 +-
.../artemis/ra/ActiveMQRATopicSubscriber.java | 17 +-
.../activemq/artemis/ra/ActiveMQRAXAResource.java | 48 +-
.../activemq/artemis/ra/ActiveMQRaUtils.java | 5 +-
.../artemis/ra/ActiveMQResourceAdapter.java | 37 +-
.../artemis/ra/ConnectionFactoryProperties.java | 260 +--
.../artemis/ra/inflow/ActiveMQActivation.java | 11 +-
.../artemis/ra/inflow/ActiveMQActivationSpec.java | 5 +-
.../artemis/ra/inflow/ActiveMQMessageHandler.java | 7 +-
.../artemis/ra/recovery/RecoveryManager.java | 11 +-
artemis-rest/pom.xml | 25 +-
.../activemq/artemis/rest/ActiveMQRestLogger.java | 62 +-
.../artemis/rest/MessageServiceManager.java | 8 +-
.../rest/queue/AcknowledgedQueueConsumer.java | 9 +-
.../artemis/rest/queue/ConsumedMessage.java | 7 +-
.../artemis/rest/queue/ConsumersResource.java | 12 +-
.../activemq/artemis/rest/queue/PostMessage.java | 11 +-
.../artemis/rest/queue/PostMessageDupsOk.java | 9 +-
.../artemis/rest/queue/PostMessageNoDups.java | 7 +-
.../activemq/artemis/rest/queue/QueueConsumer.java | 16 +-
.../rest/queue/QueueDestinationsResource.java | 7 +-
.../activemq/artemis/rest/queue/QueueResource.java | 11 +-
.../queue/push/PushConsumerMessageHandler.java | 12 +-
.../rest/queue/push/PushConsumerResource.java | 11 +-
.../artemis/rest/queue/push/UriStrategy.java | 16 +-
.../rest/topic/PushSubscriptionsResource.java | 11 +-
.../artemis/rest/topic/SubscriptionsResource.java | 18 +-
.../rest/topic/TopicDestinationsResource.java | 7 +-
.../activemq/artemis/rest/topic/TopicResource.java | 11 +-
.../artemis/rest/util/HttpMessageHelper.java | 12 +-
.../activemq/artemis/rest/util/TimeoutTask.java | 9 +-
artemis-selector/pom.xml | 5 -
.../artemis/selector/SelectorParserTest.java | 5 +-
artemis-server-osgi/pom.xml | 30 +-
.../activemq/artemis/osgi/ActiveMQOsgiLogger.java | 48 +-
artemis-server/pom.xml | 26 +-
.../core/config/impl/ConfigurationImpl.java | 5 +-
.../core/config/impl/LegacyJMSConfiguration.java | 5 +-
.../deployers/impl/FileConfigurationParser.java | 7 +-
.../artemis/core/filter/impl/FilterImpl.java | 11 +-
.../management/impl/ActiveMQServerControlImpl.java | 5 +-
.../core/management/impl/AddressControlImpl.java | 20 +-
.../core/management/impl/QueueControlImpl.java | 5 +-
.../core/paging/cursor/PagedReferenceImpl.java | 5 +-
.../paging/cursor/impl/PageCursorProviderImpl.java | 28 +-
.../cursor/impl/PageSubscriptionCounterImpl.java | 5 +-
.../paging/cursor/impl/PageSubscriptionImpl.java | 43 +-
.../activemq/artemis/core/paging/impl/Page.java | 10 +-
.../artemis/core/paging/impl/PageCache.java | 5 +-
.../artemis/core/paging/impl/PageReadWriter.java | 11 +-
.../core/paging/impl/PageTransactionInfoImpl.java | 5 +-
.../core/paging/impl/PagingManagerImpl.java | 9 +-
.../artemis/core/paging/impl/PagingStoreImpl.java | 25 +-
.../journal/AbstractJournalStorageManager.java | 9 +-
.../impl/journal/BatchingIDGenerator.java | 5 +-
.../persistence/impl/journal/DescribeJournal.java | 5 +-
.../impl/journal/JournalStorageManager.java | 5 +-
.../core/persistence/impl/journal/LargeBody.java | 7 +-
.../impl/journal/LargeServerMessageImpl.java | 5 +-
.../impl/journal/LargeServerMessageInSync.java | 5 +-
.../artemis/core/postoffice/impl/BindingsImpl.java | 13 +-
.../postoffice/impl/InMemoryDuplicateIDCache.java | 43 +-
.../core/postoffice/impl/LocalQueueBinding.java | 5 +-
.../impl/PersistentDuplicateIDCache.java | 51 +-
.../core/postoffice/impl/PostOfficeImpl.java | 25 +-
.../core/postoffice/impl/SimpleAddressManager.java | 5 +-
.../protocol/core/ServerSessionPacketHandler.java | 5 +-
.../protocol/core/impl/ActiveMQPacketHandler.java | 5 +-
.../protocol/core/impl/CoreProtocolManager.java | 5 +-
.../core/remoting/impl/invm/InVMAcceptor.java | 5 +-
.../core/remoting/impl/invm/InVMConnection.java | 5 +-
.../core/remoting/impl/invm/InVMConnector.java | 10 +-
.../core/remoting/impl/netty/NettyAcceptor.java | 13 +-
.../remoting/server/impl/RemotingServiceImpl.java | 11 +-
.../core/replication/ReplicatedJournal.java | 5 +-
.../core/replication/ReplicationEndpoint.java | 5 +-
.../core/replication/ReplicationManager.java | 13 +-
.../core/security/impl/SecurityStoreImpl.java | 5 +-
.../artemis/core/server/ActiveMQMessageBundle.java | 232 ++-
.../artemis/core/server/ActiveMQServerLogger.java | 1670 ++++++------------
.../server/LoggingConfigurationFileReloader.java | 89 -
.../core/server/LoggingConfigurationUpdater.java | 447 -----
.../artemis/core/server/MemoryManager.java | 9 +-
.../activemq/artemis/core/server/NodeManager.java | 5 +-
.../artemis/core/server/cluster/BackupManager.java | 7 +-
.../core/server/cluster/ClusterController.java | 7 +-
.../core/server/cluster/ClusterManager.java | 7 +-
.../core/server/cluster/impl/BridgeImpl.java | 9 +-
.../server/cluster/impl/BroadcastGroupImpl.java | 5 +-
.../cluster/impl/ClusterConnectionBridge.java | 5 +-
.../server/cluster/impl/ClusterConnectionImpl.java | 9 +-
.../cluster/impl/RemoteQueueBindingImpl.java | 5 +-
.../cluster/qourum/SharedNothingBackupQuorum.java | 15 +-
.../federation/AbstractFederationStream.java | 5 +-
.../core/server/federation/FederatedAbstract.java | 5 +-
.../federation/FederatedQueueConsumerImpl.java | 5 +-
.../server/federation/FederationDownstream.java | 5 +-
.../server/federation/queue/FederatedQueue.java | 5 +-
.../artemis/core/server/files/FileMoveManager.java | 21 +-
.../core/server/files/FileStoreMonitor.java | 5 +-
.../server/group/impl/LocalGroupingHandler.java | 7 +-
.../core/server/impl/ActiveMQServerImpl.java | 25 +-
.../artemis/core/server/impl/AddressInfo.java | 6 +-
.../impl/AnyLiveNodeLocatorForScaleDown.java | 5 +-
.../artemis/core/server/impl/DivertImpl.java | 5 +-
.../core/server/impl/FileBasedNodeManager.java | 5 +-
.../core/server/impl/FileLockNodeManager.java | 14 +-
.../artemis/core/server/impl/LastValueQueue.java | 5 +-
.../impl/LegacyLDAPSecuritySettingPlugin.java | 9 +-
.../core/server/impl/LiveOnlyActivation.java | 5 +-
.../impl/NamedLiveNodeLocatorForScaleDown.java | 5 +-
.../core/server/impl/PostOfficeJournalLoader.java | 15 +-
.../artemis/core/server/impl/QueueImpl.java | 17 +-
.../artemis/core/server/impl/QueueManagerImpl.java | 7 +-
.../core/server/impl/QueueMessageMetrics.java | 9 +-
.../artemis/core/server/impl/RefsOperation.java | 5 +-
.../server/impl/ReplicationBackupActivation.java | 21 +-
.../artemis/core/server/impl/ReplicationError.java | 5 +-
.../core/server/impl/ReplicationObserver.java | 9 +-
.../server/impl/ReplicationPrimaryActivation.java | 17 +-
.../core/server/impl/RoutingContextImpl.java | 5 +-
.../artemis/core/server/impl/ScaleDownHandler.java | 7 +-
.../server/impl/ScheduledDeliveryHandlerImpl.java | 5 +-
.../core/server/impl/ServerConsumerImpl.java | 9 +-
.../core/server/impl/ServerSessionImpl.java | 5 +-
.../server/impl/SharedNothingBackupActivation.java | 5 +-
.../server/impl/SharedNothingLiveActivation.java | 9 +-
.../server/impl/SharedStoreBackupActivation.java | 5 +-
.../server/impl/SharedStoreLiveActivation.java | 5 +-
.../server/impl/TransientQueueManagerImpl.java | 5 +-
.../impl/jdbc/ActiveMQScheduledLeaseLock.java | 15 +-
.../core/server/impl/jdbc/JdbcLeaseLock.java | 39 +-
.../core/server/impl/jdbc/JdbcNodeManager.java | 97 +-
.../server/impl/jdbc/JdbcSharedStateManager.java | 9 +-
.../quorum/ActivationSequenceStateMachine.java | 30 +-
.../server/management/ArtemisMBeanServerGuard.java | 9 +-
.../server/management/ManagementConnector.java | 13 +-
.../management/impl/HawtioSecurityControlImpl.java | 8 +-
.../management/impl/ManagementServiceImpl.java | 5 +-
.../core/server/metrics/MetricsManager.java | 5 +-
.../impl/BrokerMessageAuthorizationPlugin.java | 5 +-
.../plugin/impl/LoggingActiveMQServerPlugin.java | 189 +-
.../impl/LoggingActiveMQServerPluginLogger.java | 155 +-
.../impl/NotificationActiveMQServerPlugin.java | 5 +-
.../core/server/reload/ReloadManagerImpl.java | 5 +-
.../artemis/core/server/replay/ReplayManager.java | 5 +-
.../core/server/routing/ConnectionRouter.java | 5 +-
.../server/routing/ConnectionRouterManager.java | 9 +-
.../artemis/core/server/routing/KeyResolver.java | 25 +-
.../core/server/routing/caches/LocalCache.java | 5 +-
.../routing/policies/LeastConnectionsPolicy.java | 5 +-
.../core/server/routing/pools/AbstractPool.java | 7 +-
.../server/routing/targets/ActiveMQTarget.java | 5 +-
.../core/server/routing/targets/TargetMonitor.java | 5 +-
.../impl/HierarchicalObjectRepository.java | 5 +-
.../core/transaction/impl/TransactionImpl.java | 5 +-
.../spi/core/protocol/EmbedMessageUtil.java | 7 +-
.../spi/core/protocol/MessagePersister.java | 5 +-
.../security/ActiveMQBasicSecurityManager.java | 5 +-
.../core/security/ActiveMQJAASSecurityManager.java | 5 +-
.../core/security/ActiveMQSecurityManagerImpl.java | 5 +-
.../jaas/AbstractPrincipalLoginModule.java | 5 +-
.../core/security/jaas/CertificateLoginModule.java | 5 +-
.../jaas/ExternalCertificateLoginModule.java | 5 +-
.../spi/core/security/jaas/GuestLoginModule.java | 5 +-
.../spi/core/security/jaas/InVMLoginModule.java | 5 +-
.../spi/core/security/jaas/LDAPLoginModule.java | 5 +-
.../jaas/PrincipalConversionLoginModule.java | 5 +-
.../spi/core/security/jaas/PropertiesLoader.java | 5 +-
.../core/security/jaas/PropertiesLoginModule.java | 5 +-
.../core/security/jaas/ReloadableProperties.java | 9 +-
.../core/config/impl/ConfigurationImplTest.java | 5 +-
.../LoggingConfigurationFileReloaderTest.java | 128 --
.../core/security/jaas/GuestLoginModuleTest.java | 5 +-
.../security/jaas/JAASSecurityManagerTest.java | 5 +-
.../security/jaas/PropertiesLoginModuleTest.java | 5 +-
.../jaas/TextFileCertificateLoginModuleTest.java | 10 +-
.../core/server/files/FileStoreMonitorTest.java | 5 +-
.../server/impl/ScheduledDeliveryHandlerTest.java | 5 +-
.../core/transaction/impl/TransactionImplTest.java | 5 +-
.../core/security/jaas/LDAPLoginModuleTest.java | 5 +-
.../artemis/tests/util/ActiveMQTestBase.java | 19 +-
.../activemq/artemis/tests/util/NoFilesBehind.java | 5 +-
.../artemis/tests/util/NoProcessFilesBehind.java | 5 +-
.../activemq/artemis/uri/AcceptorParserTest.java | 11 +-
.../src/test/resources/reload-logging-1.properties | 21 -
.../src/test/resources/reload-logging-2.properties | 21 -
artemis-service-extensions/pom.xml | 42 +-
.../extensions/ActiveMQServiceExtensionLogger.java | 28 +-
.../xa/recovery/ActiveMQXARecoveryLogger.java | 87 +-
.../xa/recovery/ActiveMQXAResourceRecovery.java | 23 +-
.../xa/recovery/ActiveMQXAResourceWrapper.java | 78 +-
artemis-unit-test-support/pom.xml | 4 +-
.../artemis/utils/CleanupSystemPropertiesRule.java | 5 +-
.../apache/activemq/artemis/utils/RetryRule.java | 5 +-
.../artemis/utils/ThreadLeakCheckRule.java | 5 +-
.../org/apache/activemq/artemis/utils/Wait.java | 5 +-
artemis-web/pom.xml | 31 +-
.../apache/activemq/artemis/ActiveMQWebLogger.java | 48 +-
.../artemis/component/WebServerComponent.java | 5 +-
.../activemq/artemis/component/WebTmpCleaner.java | 7 +-
pom.xml | 76 +-
tests/activemq5-unit-tests/pom.xml | 16 -
tests/artemis-test-support/pom.xml | 5 -
.../apache/activemq/artemis/tests/util/Jmx.java | 8 +-
.../apache/activemq/artemis/utils/ExecuteUtil.java | 5 +-
tests/compatibility-tests/pom.xml | 30 +-
.../e2e/brokerConnection/ChainedMirrorTest.java | 3 -
.../DualMirrorFailoverWithContainerTest.java | 5 +-
.../e2e/brokerConnection/QpidDispatchPeerTest.java | 9 +-
.../e2e/brokerConnection/SplitMirrorTest.java | 3 -
tests/extra-tests/pom.xml | 28 +-
.../artemis/tests/extras/jms/xa/XATest.java | 10 +-
tests/integration-tests/pom.xml | 30 +-
.../integration/MultiThreadedAuditLoggingTest.java | 12 +-
.../integration/amqp/AmqpIngressTimestampTest.java | 2 +-
.../client/ExpireTestOnRestartTest.java | 2 +-
.../failover/MultipleServerFailoverTestBase.java | 6 +-
.../tests/integration/jms/client/MessageTest.java | 12 +-
.../jms/client/MoveMessageDuplicateIDTest.java | 4 +-
.../jms/client/NewQueueRequestorTest.java | 2 +-
.../integration/management/QueueControlTest.java | 2 +-
.../tests/integration/mqtt5/MQTT5TestSupport.java | 4 +-
.../integration/openwire/SimpleOpenWireTest.java | 2 +-
.../integration/paging/AddressFullLoggingTest.java | 13 +-
.../integration/server/NetworkHealthCheckTest.java | 13 +-
.../integration/server/SimpleStartStopTest.java | 5 +-
.../integration/stomp/v11/ExtraStompTest.java | 4 +-
.../tests/integration/stomp/v11/StompV11Test.java | 2 +-
.../tests/integration/stomp/v12/StompV12Test.java | 12 +-
tests/jms-tests/pom.xml | 26 +-
.../artemis/jms/tests/AcknowledgementTest.java | 114 +-
.../artemis/jms/tests/ActiveMQServerTestCase.java | 12 +-
.../jms/tests/AutoAckMessageListenerTest.java | 20 +-
.../artemis/jms/tests/ConnectionClosedTest.java | 8 +-
.../artemis/jms/tests/ConnectionFactoryTest.java | 12 +-
.../activemq/artemis/jms/tests/ConnectionTest.java | 8 +-
.../artemis/jms/tests/ConsumerClosedTest.java | 8 +-
.../apache/activemq/artemis/jms/tests/JMSTest.java | 6 +-
.../artemis/jms/tests/MessageConsumerTest.java | 104 +-
.../artemis/jms/tests/MessageProducerTest.java | 10 +-
.../artemis/jms/tests/PersistenceTest.java | 6 +-
.../jms/tests/TemporaryDestinationTest.java | 6 +-
.../artemis/jms/tests/TransactedSessionTest.java | 20 +-
.../jms/tests/message/JMSExpirationHeaderTest.java | 23 +-
.../artemis/jms/tests/message/MessageBodyTest.java | 11 +-
.../jms/tests/message/MessageHeaderTest.java | 21 +-
.../artemis/jms/tests/message/MessageTestBase.java | 8 +-
.../message/foreign/ForeignBytesMessageTest.java | 6 +-
.../message/foreign/ForeignMapMessageTest.java | 6 +-
.../tests/message/foreign/ForeignMessageTest.java | 6 +-
.../message/foreign/ForeignObjectMessageTest.java | 6 +-
.../message/foreign/ForeignStreamMessageTest.java | 6 +-
.../artemis/jms/tests/selector/SelectorTest.java | 26 +-
.../artemis/jms/tests/tools/ServerManagement.java | 17 +-
.../jms/tests/tools/container/InVMContext.java | 10 +-
.../InVMInitialContextFactoryBuilder.java | 11 +-
.../jms/tests/tools/container/LocalTestServer.java | 7 +-
.../artemis/jms/tests/util/JNDIUtilTest.java | 5 +-
.../artemis/jms/tests/util/ProxyAssertSupport.java | 73 +-
tests/joram-tests/pom.xml | 21 +-
.../artemis/common/testjndi/TestContext.java | 7 +-
tests/karaf-client-integration-tests/pom.xml | 10 +-
tests/performance-tests/pom.xml | 14 +-
tests/smoke-tests/pom.xml | 20 +-
.../bridgeTransfer/BridgeTransferingTest.java | 11 +-
.../DualMirrorNoContainerTest.java | 3 -
.../brokerConnection/PagedMirrorSmokeTest.java | 3 -
.../tests/smoke/dnsswitch/DNSSwitchTest.java | 5 +-
.../infinite/InfiniteRedeliverySmokeTest.java | 9 +-
.../artemis/tests/smoke/jms/ManifestTest.java | 2 -
.../ReplicatedMultipleFailbackTest.java | 27 +-
.../tests/smoke/mmfactory/MMSFactoryTest.java | 25 +-
.../smoke/paging/FloodServerWithAsyncSendTest.java | 11 +-
.../quorum/PluggableQuorumSinglePairTest.java | 41 +-
.../quorum/ZookeeperPluggableQuorumPeerTest.java | 13 +-
.../ZookeeperPluggableQuorumSinglePairTest.java | 7 +-
.../smoke/replicationflow/SoakPagingTest.java | 17 +-
.../core/journal/impl/JournalImplTestUnit.java | 7 +-
.../core/server/impl/QueueConcurrentTest.java | 9 +-
.../timing/jms/bridge/impl/JMSBridgeImplTest.java | 9 +-
tests/unit-tests/pom.xml | 29 +-
.../artemis/tests/unit/AllClassesTest.java | 15 +-
.../asyncio/MultiThreadAsynchronousFileTest.java | 5 +-
.../core/journal/impl/AlignedJournalImplTest.java | 9 +-
.../journal/impl/JournaHistorylBackupTest.java | 2 +-
.../core/journal/impl/JournalImplTestBase.java | 5 +-
.../core/journal/impl/JournalImplTestUnit.java | 7 +-
.../unit/core/journal/impl/TimedBufferTest.java | 9 +-
.../unit/core/message/impl/MessageImplTest.java | 7 +-
.../unit/core/paging/impl/PagingStoreImplTest.java | 17 +-
.../impl/WildcardAddressManagerUnitTest.java | 7 +-
.../tests/unit/core/server/impl/QueueImplTest.java | 7 +-
.../unit/core/util/RandomUtilDistributionTest.java | 9 +-
.../tests/unit/logging/AssertionLoggerTest.java | 7 +-
.../unit/ra/ActiveMQResourceAdapterConfigTest.java | 7 +-
.../artemis/tests/unit/util/InVMContext.java | 7 +-
.../artemis/tests/unit/util/InVMNamingContext.java | 7 +-
.../artemis/tests/unit/util/MemorySizeTest.java | 5 +-
.../artemis/tests/unit/util/ReusableLatchTest.java | 9 +-
522 files changed, 7203 insertions(+), 8937 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 40b35843f0..3255c23d16 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,6 +4,7 @@ on: [push, pull_request, workflow_dispatch]
jobs:
test:
+ if: github.repository != 'apache/activemq-artemis' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
name: Test (${{ matrix.java }})
runs-on: ubuntu-20.04
strategy:
@@ -43,6 +44,7 @@ jobs:
if [ -d ~/.m2/repository/org/apache/activemq ]; then find ~/.m2/repository/org/apache/activemq -name "*-SNAPSHOT" -type d -prune -exec rm -r '{}' \; ; fi
checks:
+ if: github.repository != 'apache/activemq-artemis' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
name: Checks (${{ matrix.java }})
runs-on: ubuntu-20.04
strategy:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b0ea79e8be..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: java
-install: true
-matrix:
- include:
- - os: linux
- jdk: openjdk11
- env:
- - EXAMPLES_PROFILE="release"
- - os: linux
- jdk: openjdk17
- env:
- - EXAMPLES_PROFILE="examples,noRun"
-
-# clean out Artemis artifacts from the cache
-before_install:
-- rm -rf $HOME/.m2/repository/org/apache/activemq/artemis-*
-
-# use 'install' so smoke-tests will work
-# use '-Pextra-tests' to ensure extra-tests compiles even though they won't actually run
-# By setting anything to org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED we are disabling libaio loading on the testsuite
-script:
-- set -e
-- mvn -s .github/maven-settings.xml -ntp -Dorg.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED=AnythingNotNull -Dmaven.test.redirectTestOutputToFile=true -Derrorprone -Pdev -Pfast-tests -Pextra-tests -Ptests-CI -Pjmh -B install
-- cd examples
-- mvn -s ../.github/maven-settings.xml verify -P${EXAMPLES_PROFILE} -B -q
-
-cache:
- directories:
- - $HOME/.m2
-before_cache:
- - rm -rf $HOME/.m2/repository/org/apache/activemq/artemis-*
- - rm -rf $HOME/.m2/repository/org/apache/activemq/*-artemis
- - rm -rf $HOME/.m2/repository/org/apache/activemq/examples
diff --git a/artemis-cdi-client/pom.xml b/artemis-cdi-client/pom.xml
index 62896a4d92..30f9f7fb22 100644
--- a/artemis-cdi-client/pom.xml
+++ b/artemis-cdi-client/pom.xml
@@ -35,29 +35,21 @@
<name>ActiveMQ Artemis CDI Integration</name>
<dependencies>
+ <!-- logging -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-processor</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logmanager</groupId>
- <artifactId>jboss-logmanager</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.wildfly.common</groupId>
- <artifactId>wildfly-common</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
index f02d51b95b..4f75c76eeb 100644
--- a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
+++ b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
@@ -21,11 +21,9 @@ package org.apache.artemis.client.cdi.logger;
import javax.enterprise.inject.spi.ProcessBean;
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
/**
* Logger code 57
@@ -41,24 +39,20 @@ import org.jboss.logging.annotations.MessageLogger;
*
* so an INFO message would be 571000 to 571999
*/
-@MessageLogger(projectCode = "AMQ")
-public interface ActiveMQCDILogger extends BasicLogger {
+@LogBundle(projectCode = "AMQ")
+public interface ActiveMQCDILogger {
- ActiveMQCDILogger LOGGER = Logger.getMessageLogger(ActiveMQCDILogger.class, ActiveMQCDILogger.class.getPackage().getName());
+ ActiveMQCDILogger LOGGER = CodeFactory.getCodeClass(ActiveMQCDILogger.class, ActiveMQCDILogger.class.getPackage().getName());
- @LogMessage
- @Message(id = 571000, value = "Discovered configuration class {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 571000, value = "Discovered configuration class {}", level = LogMessage.Level.INFO)
void discoveredConfiguration(ProcessBean<?> pb);
- @LogMessage
- @Message(id = 571001, value = "Discovered client configuration class {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 571001, value = "Discovered client configuration class {}", level = LogMessage.Level.INFO)
void discoveredClientConfiguration(ProcessBean<?> pb);
- @LogMessage(level = Logger.Level.DEBUG)
- @Message(id = 573000, value = "Configuration found, not using built in configuration")
+ @LogMessage(id = 573000, value = "Configuration found, not using built in configuration", level = LogMessage.Level.DEBUG)
void notUsingDefaultConfiguration();
- @LogMessage(level = Logger.Level.DEBUG)
- @Message(id = 573001, value = "Configuration found, not using built in configuration")
+ @LogMessage(id = 573001, value = "Configuration found, not using built in configuration", level = LogMessage.Level.DEBUG)
void notUsingDefaultClientConfiguration();
}
diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml
index 4f0ae2fc1b..d6f23b0365 100644
--- a/artemis-cli/pom.xml
+++ b/artemis-cli/pom.xml
@@ -82,22 +82,23 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
</dependency>
+ <!-- logging -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-processor</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
- <optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>runtime</scope> <!-- TODO: decide whether to only supply via assembly or here -->
</dependency>
+
<dependency>
<groupId>io.airlift</groupId>
<artifactId>airline</artifactId>
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Configurable.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Configurable.java
index 686f042248..5767d57b75 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Configurable.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Configurable.java
@@ -33,14 +33,17 @@ import org.apache.activemq.artemis.core.config.FileDeploymentManager;
import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
import org.apache.activemq.artemis.dto.BrokerDTO;
import org.apache.activemq.artemis.dto.ManagementContextDTO;
-import org.apache.activemq.artemis.integration.bootstrap.ActiveMQBootstrapLogger;
import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Abstract class where we can replace the configuration in various places *
*/
public abstract class Configurable extends ActionAbstract {
+ private static final Logger logger = LoggerFactory.getLogger(Configurable.class);
+
@Arguments(description = "Broker Configuration URI, default 'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml'")
String configuration;
@@ -55,7 +58,7 @@ public abstract class Configurable extends ActionAbstract {
private FileConfiguration fileConfiguration;
protected void treatError(Exception e, String group, String command) {
- ActiveMQBootstrapLogger.LOGGER.debug(e.getMessage(), e);
+ logger.debug(e.getMessage(), e);
System.err.println();
System.err.println("Error:" + e.getMessage());
System.err.println();
@@ -142,7 +145,7 @@ public abstract class Configurable extends ActionAbstract {
// To support Windows paths as explained above.
configuration = configuration.replace("\\", "/");
- ActiveMQBootstrapLogger.LOGGER.usingBrokerConfig(configuration);
+ logger.debug("Using broker configuration: {}", configuration);
}
return configuration;
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
index 78ae5ecb1d..c9383b9b6a 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
@@ -40,12 +40,13 @@ import org.apache.activemq.artemis.api.core.client.ClientMessage;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.utils.Base64;
import org.apache.activemq.artemis.utils.UUIDGenerator;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** This is an Utility class that will import the outputs in XML format. */
public class XMLMessageImporter {
- private static final Logger logger = Logger.getLogger(XMLMessageImporter.class);
+ private static final Logger logger = LoggerFactory.getLogger(XMLMessageImporter.class);
private XMLStreamReader reader;
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
index 117408224c..7a64dc06f4 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
@@ -62,13 +62,16 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.codec.CursorAck
import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PageUpdateTXEncoding;
import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PersistentAddressBindingEncoding;
import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PersistentQueueBindingEncoding;
-import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Command(name = "exp", description = "Export all message-data using an XML that could be interpreted by any system.")
public final class XmlDataExporter extends DBOption {
+ private static final Logger logger = LoggerFactory.getLogger(XmlDataExporter.class);
+
private XMLStreamWriter xmlWriter;
// an inner map of message refs hashed by the queue ID to which they belong and then hashed by their record ID
@@ -149,8 +152,8 @@ public final class XmlDataExporter extends DBOption {
getBindings();
processMessageJournal();
printDataAsXML();
- ActiveMQServerLogger.LOGGER.debug("\n\nProcessing took: " + (System.currentTimeMillis() - start) + "ms");
- ActiveMQServerLogger.LOGGER.debug("Output " + messagesPrinted + " messages and " + bindingsPrinted + " bindings.");
+ logger.debug("\n\nProcessing took: {}ms", (System.currentTimeMillis() - start));
+ logger.debug("Output {} messages and {} bindings.", messagesPrinted, bindingsPrinted);
}
/**
@@ -169,7 +172,7 @@ public final class XmlDataExporter extends DBOption {
Journal messageJournal = storageManager.getMessageJournal();
- ActiveMQServerLogger.LOGGER.debug("Reading journal from " + config.getJournalDirectory());
+ logger.debug("Reading journal from {}", config.getJournalDirectory());
messageJournal.start();
@@ -201,7 +204,7 @@ public final class XmlDataExporter extends DBOption {
}
}
- ActiveMQServerLogger.LOGGER.debug(message.toString());
+ logger.debug(message.toString());
}
};
@@ -299,7 +302,7 @@ public final class XmlDataExporter extends DBOption {
bindingsJournal.start();
- ActiveMQServerLogger.LOGGER.debug("Reading bindings journal from " + config.getBindingsDirectory());
+ logger.debug("Reading bindings journal from {}", config.getBindingsDirectory());
bindingsJournal.load(records, null, null);
@@ -396,11 +399,11 @@ public final class XmlDataExporter extends DBOption {
if (pageStore != null) {
File folder = pageStore.getFolder();
- ActiveMQServerLogger.LOGGER.debug("Reading page store " + store + " folder = " + folder);
+ logger.debug("Reading page store {} folder = {}", store, folder);
long pageId = pageStore.getFirstPage();
for (long i = 0; i < pageStore.getNumberOfPages(); i++) {
- ActiveMQServerLogger.LOGGER.debug("Reading page " + pageId);
+ logger.debug("Reading page {}", pageId);
Page page = pageStore.newPageObject(pageId);
page.open(false);
org.apache.activemq.artemis.utils.collections.LinkedList<PagedMessage> messages = page.read(storageManager);
@@ -445,7 +448,7 @@ public final class XmlDataExporter extends DBOption {
}
}
} else {
- ActiveMQServerLogger.LOGGER.debug("Page store was null");
+ logger.debug("Page store was null");
}
}
} catch (Exception e) {
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
index 027db44cb3..f8baad2032 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
@@ -63,7 +63,8 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.utils.ClassloadingUtil;
import org.apache.activemq.artemis.utils.ListUtil;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Read XML output from <code>org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataExporter</code>, create a core session, and
@@ -73,7 +74,7 @@ import org.jboss.logging.Logger;
@Command(name = "imp", description = "Import all message-data using an XML that could be interpreted by any system.")
public final class XmlDataImporter extends ActionAbstract {
- private static final Logger logger = Logger.getLogger(XmlDataImporter.class);
+ private static final Logger logger = LoggerFactory.getLogger(XmlDataImporter.class);
private XMLStreamReader reader;
@@ -329,7 +330,7 @@ public final class XmlDataImporter extends ActionAbstract {
logMessage.delete(logMessage.length() - 2, logMessage.length()); // take off the trailing comma
if (logger.isDebugEnabled()) {
- logger.debug(logMessage);
+ logger.debug(logMessage.toString()); //TODO: this potentially expensive logMessage StringBuilder is still prepared even if debug isnt enabled
}
message.putBytesProperty(Message.HDR_ROUTE_TO_IDS, buffer.array());
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
index fcadb24c32..f0c1904f95 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
@@ -16,12 +16,9 @@
*/
package org.apache.activemq.artemis.integration.bootstrap;
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
/**
* Logger Code 10
@@ -37,47 +34,23 @@ import org.jboss.logging.annotations.MessageLogger;
*
* so an INFO message would be 101000 to 101999
*/
-@MessageLogger(projectCode = "AMQ")
-public interface ActiveMQBootstrapLogger extends BasicLogger {
+@LogBundle(projectCode = "AMQ")
+public interface ActiveMQBootstrapLogger {
- /**
- * The default logger.
- */
- ActiveMQBootstrapLogger LOGGER = Logger.getMessageLogger(ActiveMQBootstrapLogger.class, ActiveMQBootstrapLogger.class.getPackage().getName());
+ ActiveMQBootstrapLogger LOGGER = CodeFactory.getCodeClass(ActiveMQBootstrapLogger.class, ActiveMQBootstrapLogger.class.getPackage().getName());
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 101000, value = "Starting ActiveMQ Artemis Server", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 101000, value = "Starting ActiveMQ Artemis Server", level = LogMessage.Level.INFO)
void serverStarting();
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 101001, value = "Stopping ActiveMQ Artemis Server", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 101001, value = "Stopping ActiveMQ Artemis Server", level = LogMessage.Level.INFO)
void serverStopping();
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 101002, value = "Starting Naming server on {0}:{1,number,#} (rmi {2}:{3,number,#})", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 101002, value = "Starting Naming server on {}:{} (rmi {}:{})", level = LogMessage.Level.INFO)
void startedNamingService(String bindAddress, int port, String rmiBindAddress, int rmiPort);
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 101003, value = "Halting ActiveMQ Artemis Server after user request", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 101003, value = "Halting ActiveMQ Artemis Server after user request", level = LogMessage.Level.INFO)
void serverKilled();
- @LogMessage(level = Logger.Level.DEBUG)
- @Message(id = 101005, value = "Using broker configuration: {0}", format = Message.Format.MESSAGE_FORMAT)
- void usingBrokerConfig(String location);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 102000, value = "Error during undeployment: {0}", format = Message.Format.MESSAGE_FORMAT)
- void errorDuringUndeployment(@Cause Throwable t, String name);
-
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 104000, value = "Failed to delete file {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 104000, value = "Failed to delete file {}", level = LogMessage.Level.ERROR)
void errorDeletingFile(String name);
-
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 104001, value = "Failed to start server", format = Message.Format.MESSAGE_FORMAT)
- void errorStartingServer(@Cause Exception e);
-
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 104002, value = "The print data operation failed: {0}", format = Message.Format.MESSAGE_FORMAT)
- void printDataFailed(String exceptionMessage);
}
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
index cdaa19686e..eb12c8e951 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
@@ -97,11 +97,12 @@ import org.apache.activemq.artemis.utils.Wait;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
import org.apache.commons.configuration2.builder.fluent.Configurations;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -117,7 +118,7 @@ import static org.junit.Assert.fail;
* Test to validate that the CLI doesn't throw improper exceptions when invoked.
*/
public class ArtemisTest extends CliTestBase {
- private static final Logger log = Logger.getLogger(ArtemisTest.class);
+ private static final Logger log = LoggerFactory.getLogger(ArtemisTest.class);
// some tests will set this, as some security methods will need to know the server the CLI started
private ActiveMQServer server;
@@ -168,9 +169,9 @@ public class ArtemisTest extends CliTestBase {
int writes = 2;
int tries = 5;
long totalAvg = SyncCalculation.syncTest(temporaryFolder.getRoot(), 4096, writes, tries, true, true, true, "file.tmp", 1, JournalType.NIO);
- log.debug("TotalAvg = " + totalAvg);
+ log.debug("TotalAvg = {}", totalAvg);
long nanoTime = SyncCalculation.toNanos(totalAvg, writes, false);
- log.debug("nanoTime avg = " + nanoTime);
+ log.debug("nanoTime avg = {}", nanoTime);
assertEquals(0, LibaioContext.getTotalMaxIO());
}
@@ -301,7 +302,7 @@ public class ArtemisTest extends CliTestBase {
byte[] contents = Files.readAllBytes(bootstrapFile.toPath());
String cfgText = new String(contents);
- log.debug("confg: " + cfgText);
+ log.debug("confg: {}", cfgText);
config = parseXml(bootstrapFile);
webElem = (Element) config.getElementsByTagName("web").item(0);
@@ -447,7 +448,7 @@ public class ArtemisTest extends CliTestBase {
listCmd.execute(context);
String result = context.getStdout();
- log.debug("output1:\n" + result);
+ log.debug("output1:\n{}", result);
//default only one user admin with role amq
assertTrue(result.contains("\"admin\"(amq)"));
@@ -466,7 +467,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output2:\n" + result);
+ log.debug("output2:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertTrue(result.contains("\"guest\"(admin)"));
@@ -487,7 +488,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output3:\n" + result);
+ log.debug("output3:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertTrue(result.contains("\"guest\"(admin)"));
@@ -512,7 +513,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output4:\n" + result);
+ log.debug("output4:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertTrue(result.contains("\"guest\"(admin)"));
@@ -529,7 +530,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output5:\n" + result);
+ log.debug("output5:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertFalse(result.contains("\"guest\"(admin)"));
@@ -547,7 +548,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output6:\n" + result);
+ log.debug("output6:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertFalse(result.contains("\"guest\"(admin)"));
@@ -568,7 +569,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output7:\n" + result);
+ log.debug("output7:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertTrue(result.contains("Total: 1"));
@@ -583,7 +584,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output8:\n" + result);
+ log.debug("output8:\n{}", result);
assertTrue(result.contains("Total: 0"));
} finally {
@@ -877,7 +878,7 @@ public class ArtemisTest extends CliTestBase {
listCmd.execute(context);
String result = context.getStdout();
- log.debug("output1:\n" + result);
+ log.debug("output1:\n{}", result);
//default only one user admin with role amq
assertTrue(result.contains("\"admin\"(amq)"));
@@ -893,7 +894,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output8:\n" + result);
+ log.debug("output8:\n{}", result);
assertTrue(result.contains("Total: 0"));
@@ -926,7 +927,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output2:\n" + result);
+ log.debug("output2:\n{}", result);
assertTrue(result.contains("Total: 4"));
assertTrue(result.contains("\"guest\"(admin)"));
@@ -1007,7 +1008,7 @@ public class ArtemisTest extends CliTestBase {
listCmd.execute(context);
String result = context.getStdout();
- log.debug("output1:\n" + result);
+ log.debug("output1:\n{}", result);
assertTrue(result.contains("Total: 1"));
assertTrue(result.contains("\"admin\"(amq)"));
@@ -1037,7 +1038,7 @@ public class ArtemisTest extends CliTestBase {
listCmd.execute(context);
result = context.getStdout();
- log.debug("output2:\n" + result);
+ log.debug("output2:\n{}", result);
// make sure the admin user is still in tact (i.e. that the file wasn't corrupted via concurrent access)
assertTrue(result.contains("\"admin\"(amq)"));
@@ -1110,7 +1111,7 @@ public class ArtemisTest extends CliTestBase {
listCmd.execute(context);
String result = context.getStdout();
- log.debug("output1:\n" + result);
+ log.debug("output1:\n{}", result);
assertTrue(result.contains("\"admin\"(" + roleWithSpaces + ")"));
@@ -2163,7 +2164,7 @@ public class ArtemisTest extends CliTestBase {
for (String r : roles) {
String storedUsers = (String) roleConfig.getProperty(r);
- log.debug("users in role: " + r + " ; " + storedUsers);
+ log.debug("users in role: {} ; {}", r, storedUsers);
List<String> userList = StringUtil.splitStringList(storedUsers, ",");
assertTrue(userList.contains(user));
}
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java
index 6394d72c22..7d7c26cd53 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java
@@ -18,21 +18,22 @@ package org.apache.activemq.cli.test;
import org.apache.activemq.artemis.cli.commands.util.HashUtil;
import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
-import org.jboss.logging.Logger;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class HashUtilTest {
- private static final Logger log = Logger.getLogger(HashUtilTest.class);
+ private static final Logger log = LoggerFactory.getLogger(HashUtilTest.class);
@Test
public void testDefaultHashFormat() throws Exception {
final String password = "helloworld";
String hash = HashUtil.tryHash(new TestActionContext(), password);
String hashStr = PasswordMaskingUtil.unwrap(hash);
- log.debug("hashString: " + hashStr);
+ log.debug("hashString: {}", hashStr);
String[] parts = hashStr.split(":");
assertEquals(3, parts.length);
//first part should be able to convert to an int
diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
index e1e4b37d27..5aaa2c2294 100644
--- a/artemis-commons/pom.xml
+++ b/artemis-commons/pom.xml
@@ -51,34 +51,31 @@
</dependency>
<!-- ^^ these dependencies are shaded on this JAR -->
+ <!-- logging -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-facade</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.logmanager</groupId>
- <artifactId>jboss-logmanager</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-processor</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
+ <!-- Superfluous, except for osgi manifest handling -->
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.wildfly.common</groupId>
- <artifactId>wildfly-common</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <!-- License: MIT -->
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
index 6783f7a672..09226f1410 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
@@ -28,14 +28,15 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is for components with a scheduled at a fixed rate.
*/
public abstract class ActiveMQScheduledComponent implements ActiveMQComponent, Runnable {
- private static final Logger logger = Logger.getLogger(ActiveMQScheduledComponent.class);
+ private static final Logger logger = LoggerFactory.getLogger(ActiveMQScheduledComponent.class);
protected ScheduledExecutorService scheduledExecutorService;
private boolean startedOwnScheduler;
@@ -165,7 +166,7 @@ public abstract class ActiveMQScheduledComponent implements ActiveMQComponent, R
final AtomicBoolean booked = this.bookedForRunning;
future = scheduledExecutorService.scheduleWithFixedDelay(() -> runForScheduler(booked), initialDelay >= 0 ? initialDelay : period, period, timeUnit);
} else {
- logger.tracef("did not start scheduled executor on %s because period was configured as %d", this, period);
+ logger.trace("did not start scheduled executor on {} because period was configured as {}", this, period);
}
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
index 022ee8ea30..5916eb9b96 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
@@ -35,7 +35,8 @@ import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.apache.activemq.artemis.utils.Env;
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This will use {@link InetAddress#isReachable(int)} to determine if the network is alive.
@@ -43,7 +44,7 @@ import org.jboss.logging.Logger;
*/
public class NetworkHealthCheck extends ActiveMQScheduledComponent {
- private static final Logger logger = Logger.getLogger(NetworkHealthCheck.class);
+ private static final Logger logger = LoggerFactory.getLogger(NetworkHealthCheck.class);
private final Set<ActiveMQComponent> componentList = new ConcurrentHashSet<>();
private final Set<String> addresses = new ConcurrentHashSet<>();
@@ -358,7 +359,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
public boolean check(InetAddress address) throws IOException, InterruptedException {
if (!hasCustomPingCommand() && isReachable(address)) {
if (logger.isTraceEnabled()) {
- logger.tracef(address + " OK");
+ logger.trace(address + " OK");
}
return true;
} else {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
index c32bc67c8e..bce2df7d1b 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
@@ -17,10 +17,10 @@
package org.apache.activemq.artemis.logs;
import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
-import org.jboss.logging.Messages;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageBundle;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.Message;
/**
* Logger Code 20
@@ -29,23 +29,23 @@ import org.jboss.logging.annotations.MessageBundle;
*
* so 209000 to 209999
*/
-@MessageBundle(projectCode = "AMQ")
+@LogBundle(projectCode = "AMQ")
public interface ActiveMQUtilBundle {
- ActiveMQUtilBundle BUNDLE = Messages.getBundle(ActiveMQUtilBundle.class);
+ ActiveMQUtilBundle BUNDLE = CodeFactory.getCodeClass(ActiveMQUtilBundle.class);
- @Message(id = 209000, value = "invalid property: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 209000, value = "invalid property: {}")
ActiveMQIllegalStateException invalidProperty(String part);
- @Message(id = 209001, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 209001, value = "Invalid type: {}")
IllegalStateException invalidType(Byte type);
- @Message(id = 209002, value = "the specified string is too long ({0})", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 209002, value = "the specified string is too long ({})")
IllegalStateException stringTooLong(Integer length);
- @Message(id = 209003, value = "Error instantiating codec {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 209003, value = "Error instantiating codec {}")
IllegalArgumentException errorCreatingCodec(@Cause Exception e, String codecClassName);
- @Message(id = 209004, value = "Failed to parse long value from {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 209004, value = "Failed to parse long value from {}")
IllegalArgumentException failedToParseLong(String value);
}
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 502daffdbd..7fa668976f 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,127 +16,73 @@
*/
package org.apache.activemq.artemis.logs;
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
/**
* Logger Code 20
- *
- * each message id must be 6 digits long starting with 20, 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 201000 to 201999
*/
-@MessageLogger(projectCode = "AMQ")
-public interface ActiveMQUtilLogger extends BasicLogger {
+@LogBundle(projectCode = "AMQ")
+public interface ActiveMQUtilLogger {
- /**
- * The default logger.
- */
- ActiveMQUtilLogger LOGGER = Logger.getMessageLogger(ActiveMQUtilLogger.class, ActiveMQUtilLogger.class.getPackage().getName());
+ ActiveMQUtilLogger LOGGER = CodeFactory.getCodeClass(ActiveMQUtilLogger.class, ActiveMQUtilLogger.class.getPackage().getName());
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 201000, value = "Network is healthy, starting service {0}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 201000, value = "Network is healthy, starting service {}", level = LogMessage.Level.INFO)
void startingService(String component);
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 201001, value = "Network is unhealthy, stopping service {0}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 201001, value = "Network is unhealthy, stopping service {}", level = LogMessage.Level.WARN)
void stoppingService(String component);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202000, value = "Missing privileges to set Thread Context Class Loader on Thread Factory. Using current Thread Context Class Loader",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202000, value = "Missing privileges to set Thread Context Class Loader on Thread Factory. Using current Thread Context Class Loader", level = LogMessage.Level.WARN)
void missingPrivsForClassloader();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202001, value = "{0} is a loopback address and will be discarded.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202001, value = "{} is a loopback address and will be discarded.", level = LogMessage.Level.WARN)
void addressloopback(String address);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202002, value = "Ping Address {0} wasn't reacheable.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202002, value = "Ping Address {} wasn't reacheable.", level = LogMessage.Level.WARN)
void addressWasntReacheable(String address);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202003, value = "Ping Url {0} wasn't reacheable.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202003, value = "Ping Url {} wasn't reacheable.", level = LogMessage.Level.WARN)
void urlWasntReacheable(String url);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202004, value = "Error starting component {0} ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202004, value = "Error starting component {} ", level = LogMessage.Level.WARN)
void errorStartingComponent(@Cause Exception e, String component);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202005, value = "Error stopping component {0} ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202005, value = "Error stopping component {} ", level = LogMessage.Level.WARN)
void errorStoppingComponent(@Cause Exception e, String component);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202006, value = "Failed to check Url {0}.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202006, value = "Failed to check Url {}.", level = LogMessage.Level.WARN)
void failedToCheckURL(@Cause Exception e, String url);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202007, value = "Failed to check Address {0}.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202007, value = "Failed to check Address {}.", level = LogMessage.Level.WARN)
void failedToCheckAddress(@Cause Exception e, String address);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202008, value = "Failed to check Address list {0}.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202008, value = "Failed to check Address list {}.", level = LogMessage.Level.WARN)
void failedToParseAddressList(@Cause Exception e, String addressList);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202009, value = "Failed to check Url list {0}.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202009, value = "Failed to check Url list {}.", level = LogMessage.Level.WARN)
void failedToParseUrlList(@Cause Exception e, String urlList);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202010, value = "Failed to set NIC {0}.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202010, value = "Failed to set NIC {}.", level = LogMessage.Level.WARN)
void failedToSetNIC(@Cause Exception e, String nic);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202011, value = "Failed to read from stream {0}.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202011, value = "Failed to read from stream {}.", level = LogMessage.Level.WARN)
void failedToReadFromStream(String stream);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202012, value = "Object cannot be serialized.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202012, value = "Object cannot be serialized.", level = LogMessage.Level.WARN)
void failedToSerializeObject(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202013, value = "Unable to deserialize object.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202013, value = "Unable to deserialize object.", level = LogMessage.Level.WARN)
void failedToDeserializeObject(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202014, value = "Unable to encode byte array into Base64 notation.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202014, value = "Unable to encode byte array into Base64 notation.", level = LogMessage.Level.WARN)
void failedToEncodeByteArrayToBase64Notation(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202015, value = "Failed to clean up file {0}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202015, value = "Failed to clean up file {}", level = LogMessage.Level.WARN)
void failedToCleanupFile(String file);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 202016, value = "Could not list files to clean up in {0}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 202016, value = "Could not list files to clean up in {}", level = LogMessage.Level.WARN)
void failedListFilesToCleanup(String path);
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
index 5379b4b68c..ca41f1bf37 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
@@ -16,80 +16,20 @@
*/
package org.apache.activemq.artemis.logs;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
-import java.util.regex.Pattern;
-import org.jboss.logmanager.ExtHandler;
-import org.jboss.logmanager.ExtLogRecord;
-/**
- * This class contains a tool where programs could intercept for LogMessage given an interval of time between {@link #startCapture()}
- * and {@link #stopCapture()}
- *
- * Be careful with this use as this is intended for testing only (such as testcases)
- */
-public class AssertionLoggerHandler extends ExtHandler {
-
- private static final Map<String, ExtLogRecord> messages = new ConcurrentHashMap<>();
- private static List<String> traceMessages;
- private static boolean capture = false;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void flush() {
- }
+public class AssertionLoggerHandler {
- /**
- * {@inheritDoc}
- */
- @Override
public void close() throws SecurityException {
}
- @Override
- protected void doPublish(final ExtLogRecord record) {
- if (capture) {
- messages.put(record.getFormattedMessage(), record);
- if (traceMessages != null) {
- traceMessages.add(record.getFormattedMessage());
- }
- }
- }
-
- /**
- * is there any record matching Level?
- *
- * @param level
- * @return
- */
public static boolean hasLevel(Level level) {
- for (ExtLogRecord record : messages.values()) {
- if (record.getLevel().equals(level)) {
- return true;
- }
- }
-
return false;
}
public static boolean findText(long mstimeout, String... text) {
-
- long timeMax = System.currentTimeMillis() + mstimeout;
- do {
- if (findText(text)) {
- return true;
- }
- }
- while (timeMax > System.currentTimeMillis());
-
return false;
-
}
/**
@@ -99,87 +39,21 @@ public class AssertionLoggerHandler extends ExtHandler {
* @return
*/
public static boolean findText(final String... text) {
- for (Map.Entry<String, ExtLogRecord> entry : messages.entrySet()) {
- String key = entry.getKey();
- boolean found = true;
-
- for (String txtCheck : text) {
- found = key.contains(txtCheck);
- if (!found) {
- // If the main log message doesn't contain what we're looking for let's look in the message from the exception (if there is one).
- Throwable throwable = entry.getValue().getThrown();
- if (throwable != null && throwable.getMessage() != null) {
- found = throwable.getMessage().contains(txtCheck);
- if (!found) {
- break;
- }
- } else {
- break;
- }
- }
- }
-
- if (found) {
- return true;
- }
- }
-
return false;
}
public static int countText(final String... text) {
- int found = 0;
- if (traceMessages != null) {
- for (String str : traceMessages) {
- for (String txtCheck : text) {
- if (str.contains(txtCheck)) {
- found++;
- }
- }
- }
- } else {
- for (Map.Entry<String, ExtLogRecord> entry : messages.entrySet()) {
- String key = entry.getKey();
-
- for (String txtCheck : text) {
- if (key.contains(txtCheck)) {
- found++;
- }
- }
- }
- }
-
- return found;
+ return 0;
}
public static boolean matchText(final String pattern) {
- Pattern r = Pattern.compile(pattern);
-
- for (Map.Entry<String, ExtLogRecord> entry : messages.entrySet()) {
- if (r.matcher(entry.getKey()).matches()) {
- return true;
- } else {
- Throwable throwable = entry.getValue().getThrown();
- if (throwable != null && throwable.getMessage() != null) {
- if (r.matcher(throwable.getMessage()).matches()) {
- return true;
- }
- }
- }
- }
-
return false;
}
public static final void clear() {
- messages.clear();
- if (traceMessages != null) {
- traceMessages.clear();
- }
}
public static final void startCapture() {
- startCapture(false);
}
/**
@@ -187,16 +61,8 @@ public class AssertionLoggerHandler extends ExtHandler {
* @param individualMessages enables counting individual messages.
*/
public static final void startCapture(boolean individualMessages) {
- clear();
- if (individualMessages) {
- traceMessages = new LinkedList<>();
- }
- capture = true;
}
public static final void stopCapture() {
- capture = false;
- clear();
- traceMessages = null;
}
}
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 5633997375..0a400e978d 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,12 +16,12 @@
*/
package org.apache.activemq.artemis.logs;
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.GetLogger;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
+import org.slf4j.Logger;
import javax.management.ObjectName;
import javax.security.auth.Subject;
@@ -32,24 +32,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 {
+@LogBundle(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<>();
@@ -59,16 +48,19 @@ public interface AuditLogger extends BasicLogger {
return isBaseLoggingEnabled() || isMessageLoggingEnabled() || isResourceLoggingEnabled();
}
+ @GetLogger
+ Logger getLogger();
+
static boolean isBaseLoggingEnabled() {
- return BASE_LOGGER.isEnabled(Logger.Level.INFO);
+ return BASE_LOGGER.getLogger().isInfoEnabled();
}
static boolean isResourceLoggingEnabled() {
- return RESOURCE_LOGGER.isEnabled(Logger.Level.INFO);
+ return RESOURCE_LOGGER.getLogger().isInfoEnabled();
}
static boolean isMessageLoggingEnabled() {
- return MESSAGE_LOGGER.isEnabled(Logger.Level.INFO);
+ return MESSAGE_LOGGER.getLogger().isInfoEnabled();
}
/**
@@ -126,7 +118,7 @@ public interface AuditLogger extends BasicLogger {
return remoteAddress.get();
}
- static String arrayToString(Object value) {
+ static String parametersList(Object value) {
if (value == null) return "";
final String prefix = "with parameters: ";
@@ -158,2262 +150,1980 @@ public interface AuditLogger extends BasicLogger {
BASE_LOGGER.getRoutingTypes(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601000, value = "User {0} is getting routing type property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getRoutingTypes(String user, Object source, Object... args);
+ @LogMessage(id = 601000, value = "User {} is getting routing type property on target resource: {}", level = LogMessage.Level.INFO)
+ void getRoutingTypes(String user, Object source);
static void getRoutingTypesAsJSON(Object source) {
BASE_LOGGER.getRoutingTypesAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601001, value = "User {0} is getting routing type property as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getRoutingTypesAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601001, value = "User {} is getting routing type property as json on target resource: {}", level = LogMessage.Level.INFO)
+ void getRoutingTypesAsJSON(String user, Object source);
static void getQueueNames(Object source, Object... args) {
- BASE_LOGGER.getQueueNames(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getQueueNames(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601002, value = "User {0} is getting queue names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getQueueNames(String user, Object source, Object... args);
+ @LogMessage(id = 601002, value = "User {} is getting queue names on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getQueueNames(String user, Object source, String parameters);
static void getBindingNames(Object source) {
BASE_LOGGER.getBindingNames(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601003, value = "User {0} is getting binding names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getBindingNames(String user, Object source, Object... args);
+ @LogMessage(id = 601003, value = "User {} is getting binding names on target resource: {}", level = LogMessage.Level.INFO)
+ void getBindingNames(String user, Object source);
static void getRoles(Object source, Object... args) {
- BASE_LOGGER.getRoles(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getRoles(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601004, value = "User {0} is getting roles on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getRoles(String user, Object source, Object... args);
+ @LogMessage(id = 601004, value = "User {} is getting roles on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getRoles(String user, Object source, String parameters);
static void getRolesAsJSON(Object source, Object... args) {
- BASE_LOGGER.getRolesAsJSON(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getRolesAsJSON(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601005, value = "User {0} is getting roles as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getRolesAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601005, value = "User {} is getting roles as json on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getRolesAsJSON(String user, Object source, String parameters);
static void getNumberOfBytesPerPage(Object source) {
BASE_LOGGER.getNumberOfBytesPerPage(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601006, value = "User {0} is getting number of bytes per page on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getNumberOfBytesPerPage(String user, Object source, Object... args);
+ @LogMessage(id = 601006, value = "User {} is getting number of bytes per page on target resource: {}", level = LogMessage.Level.INFO)
+ void getNumberOfBytesPerPage(String user, Object source);
static void getAddressSize(Object source) {
BASE_LOGGER.getAddressSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601007, value = "User {0} is getting address size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAddressSize(String user, Object source, Object... args);
+ @LogMessage(id = 601007, value = "User {} is getting address size on target resource: {}", level = LogMessage.Level.INFO)
+ void getAddressSize(String user, Object source);
static void getNumberOfMessages(Object source) {
BASE_LOGGER.getNumberOfMessages(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601008, value = "User {0} is getting number of messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getNumberOfMessages(String user, Object source, Object... args);
+ @LogMessage(id = 601008, value = "User {} is getting number of messages on target resource: {}", level = LogMessage.Level.INFO)
+ void getNumberOfMessages(String user, Object source);
static void isPaging(Object source) {
BASE_LOGGER.isPaging(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601009, value = "User {0} is getting isPaging on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isPaging(String user, Object source, Object... args);
+ @LogMessage(id = 601009, value = "User {} is getting isPaging on target resource: {}", level = LogMessage.Level.INFO)
+ void isPaging(String user, Object source);
static void getNumberOfPages(Object source) {
BASE_LOGGER.getNumberOfPages(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601010, value = "User {0} is getting number of pages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getNumberOfPages(String user, Object source, Object... args);
+ @LogMessage(id = 601010, value = "User {} is getting number of pages on target resource: {}", level = LogMessage.Level.INFO)
+ void getNumberOfPages(String user, Object source);
static void getRoutedMessageCount(Object source) {
BASE_LOGGER.getRoutedMessageCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601011, value = "User {0} is getting routed message count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getRoutedMessageCount(String user, Object source, Object... args);
+ @LogMessage(id = 601011, value = "User {} is getting routed message count on target resource: {}", level = LogMessage.Level.INFO)
+ void getRoutedMessageCount(String user, Object source);
static void getUnRoutedMessageCount(Object 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);
+ @LogMessage(id = 601012, value = "User {} is getting unrouted message count on target resource: {}", level = LogMessage.Level.INFO)
+ void getUnRoutedMessageCount(String user, Object source);
static void sendMessageThroughManagement(Object source, Object... args) {
- BASE_LOGGER.sendMessageThroughManagement(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.sendMessageThroughManagement(getCaller(), source, parametersList(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 sendMessageThroughManagement(String user, Object source, Object... args);
+ @LogMessage(id = 601013, value = "User {} is sending a message on target resource: {} {}", level = LogMessage.Level.INFO)
+ void sendMessageThroughManagement(String user, Object source, String parameters);
static void getName(Object source) {
BASE_LOGGER.getName(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601014, value = "User {0} is getting name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getName(String user, Object source, Object... args);
+ @LogMessage(id = 601014, value = "User {} is getting name on target resource: {}", level = LogMessage.Level.INFO)
+ void getName(String user, Object source);
static void getAddress(Object source) {
BASE_LOGGER.getAddress(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601015, value = "User {0} is getting address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601015, value = "User {} is getting address on target resource: {}", level = LogMessage.Level.INFO)
+ void getAddress(String user, Object source);
static void getFilter(Object source) {
BASE_LOGGER.getFilter(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601016, value = "User {0} is getting filter on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getFilter(String user, Object source, Object... args);
+ @LogMessage(id = 601016, value = "User {} is getting filter on target resource: {}", level = LogMessage.Level.INFO)
+ void getFilter(String user, Object source);
static void isDurable(Object source) {
BASE_LOGGER.isDurable(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601017, value = "User {0} is getting durable property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isDurable(String user, Object source, Object... args);
+ @LogMessage(id = 601017, value = "User {} is getting durable property on target resource: {}", level = LogMessage.Level.INFO)
+ void isDurable(String user, Object source);
static void getMessageCount(Object source) {
BASE_LOGGER.getMessageCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601018, value = "User {0} is getting message count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessageCount(String user, Object source, Object... args);
+ @LogMessage(id = 601018, value = "User {} is getting message count on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessageCount(String user, Object source);
static void getMBeanInfo(Object source) {
BASE_LOGGER.getMBeanInfo(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601019, value = "User {0} is getting mbean info on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMBeanInfo(String user, Object source, Object... args);
+ @LogMessage(id = 601019, value = "User {} is getting mbean info on target resource: {}", level = LogMessage.Level.INFO)
+ void getMBeanInfo(String user, Object source);
static void getFactoryClassName(Object source) {
BASE_LOGGER.getFactoryClassName(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601020, value = "User {0} is getting factory class name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getFactoryClassName(String user, Object source, Object... args);
+ @LogMessage(id = 601020, value = "User {} is getting factory class name on target resource: {}", level = LogMessage.Level.INFO)
+ void getFactoryClassName(String user, Object source);
static void getParameters(Object source) {
BASE_LOGGER.getParameters(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601021, value = "User {0} is getting parameters on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getParameters(String user, Object source, Object... args);
+ @LogMessage(id = 601021, value = "User {} is getting parameters on target resource: {}", level = LogMessage.Level.INFO)
+ void getParameters(String user, Object source);
static void reload(Object source) {
BASE_LOGGER.reload(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601022, value = "User {0} is doing reload on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void reload(String user, Object source, Object... args);
+ @LogMessage(id = 601022, value = "User {} is doing reload on target resource: {}", level = LogMessage.Level.INFO)
+ void reload(String user, Object source);
static void isStarted(Object source) {
BASE_LOGGER.isStarted(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601023, value = "User {0} is querying isStarted on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isStarted(String user, Object source, Object... args);
+ @LogMessage(id = 601023, value = "User {} is querying isStarted on target resource: {}", level = LogMessage.Level.INFO)
+ void isStarted(String user, Object source);
static void startAcceptor(Object source) {
BASE_LOGGER.startAcceptor(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601024, value = "User {0} is starting an acceptor on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void startAcceptor(String user, Object source, Object... args);
+ @LogMessage(id = 601024, value = "User {} is starting an acceptor on target resource: {}", level = LogMessage.Level.INFO)
+ void startAcceptor(String user, Object source);
static void stopAcceptor(Object source) {
BASE_LOGGER.stopAcceptor(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601025, value = "User {0} is stopping an acceptor on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void stopAcceptor(String user, Object source, Object... args);
+ @LogMessage(id = 601025, value = "User {} is stopping an acceptor on target resource: {}", level = LogMessage.Level.INFO)
+ void stopAcceptor(String user, Object source);
static void getVersion(Object source) {
BASE_LOGGER.getVersion(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601026, value = "User {0} is getting version on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getVersion(String user, Object source, Object... args);
+ @LogMessage(id = 601026, value = "User {} is getting version on target resource: {}", level = LogMessage.Level.INFO)
+ void getVersion(String user, Object source);
static void isBackup(Object source) {
BASE_LOGGER.isBackup(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601027, value = "User {0} is querying isBackup on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isBackup(String user, Object source, Object... args);
+ @LogMessage(id = 601027, value = "User {} is querying isBackup on target resource: {}", level = LogMessage.Level.INFO)
+ void isBackup(String user, Object source);
static void isSharedStore(Object source) {
BASE_LOGGER.isSharedStore(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601028, value = "User {0} is querying isSharedStore on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isSharedStore(String user, Object source, Object... args);
+ @LogMessage(id = 601028, value = "User {} is querying isSharedStore on target resource: {}", level = LogMessage.Level.INFO)
+ void isSharedStore(String user, Object source);
static void getBindingsDirectory(Object source) {
BASE_LOGGER.getBindingsDirectory(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601029, value = "User {0} is getting bindings directory on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getBindingsDirectory(String user, Object source, Object... args);
+ @LogMessage(id = 601029, value = "User {} is getting bindings directory on target resource: {}", level = LogMessage.Level.INFO)
+ void getBindingsDirectory(String user, Object source);
static void getIncomingInterceptorClassNames(Object source) {
BASE_LOGGER.getIncomingInterceptorClassNames(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601030, value = "User {0} is getting incoming interceptor class names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getIncomingInterceptorClassNames(String user, Object source, Object... args);
+ @LogMessage(id = 601030, value = "User {} is getting incoming interceptor class names on target resource: {}", level = LogMessage.Level.INFO)
+ void getIncomingInterceptorClassNames(String user, Object source);
static void getOutgoingInterceptorClassNames(Object source) {
BASE_LOGGER.getOutgoingInterceptorClassNames(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601031, value = "User {0} is getting outgoing interceptor class names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getOutgoingInterceptorClassNames(String user, Object source, Object... args);
+ @LogMessage(id = 601031, value = "User {} is getting outgoing interceptor class names on target resource: {}", level = LogMessage.Level.INFO)
+ void getOutgoingInterceptorClassNames(String user, Object source);
static void getJournalBufferSize(Object source) {
BASE_LOGGER.getJournalBufferSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601032, value = "User {0} is getting journal buffer size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getJournalBufferSize(String user, Object source, Object... args);
+ @LogMessage(id = 601032, value = "User {} is getting journal buffer size on target resource: {}", level = LogMessage.Level.INFO)
+ void getJournalBufferSize(String user, Object source);
static void getJournalBufferTimeout(Object source) {
BASE_LOGGER.getJournalBufferTimeout(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601033, value = "User {0} is getting journal buffer timeout on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getJournalBufferTimeout(String user, Object source, Object... args);
+ @LogMessage(id = 601033, value = "User {} is getting journal buffer timeout on target resource: {}", level = LogMessage.Level.INFO)
+ void getJournalBufferTimeout(String user, Object source);
static void setFailoverOnServerShutdown(Object source, Object... args) {
- BASE_LOGGER.setFailoverOnServerShutdown(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.setFailoverOnServerShutdown(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601034, value = "User {0} is setting failover on server shutdown on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void setFailoverOnServerShutdown(String user, Object source, Object... args);
+ @LogMessage(id = 601034, value = "User {} is setting failover on server shutdown on target resource: {} {}", level = LogMessage.Level.INFO)
+ void setFailoverOnServerShutdown(String user, Object source, String parameters);
static void isFailoverOnServerShutdown(Object source) {
BASE_LOGGER.isFailoverOnServerShutdown(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601035, value = "User {0} is querying is-failover-on-server-shutdown on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isFailoverOnServerShutdown(String user, Object source, Object... args);
+ @LogMessage(id = 601035, value = "User {} is querying is-failover-on-server-shutdown on target resource: {}", level = LogMessage.Level.INFO)
+ void isFailoverOnServerShutdown(String user, Object source);
static void getJournalMaxIO(Object source) {
BASE_LOGGER.getJournalMaxIO(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601036, value = "User {0} is getting journal's max io on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getJournalMaxIO(String user, Object source, Object... args);
+ @LogMessage(id = 601036, value = "User {} is getting journal's max io on target resource: {}", level = LogMessage.Level.INFO)
+ void getJournalMaxIO(String user, Object source);
static void getJournalDirectory(Object source) {
BASE_LOGGER.getJournalDirectory(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601037, value = "User {0} is getting journal directory on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getJournalDirectory(String user, Object source, Object... args);
+ @LogMessage(id = 601037, value = "User {} is getting journal directory on target resource: {}", level = LogMessage.Level.INFO)
+ void getJournalDirectory(String user, Object source);
static void getJournalFileSize(Object source) {
BASE_LOGGER.getJournalFileSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601038, value = "User {0} is getting journal file size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getJournalFileSize(String user, Object source, Object... args);
+ @LogMessage(id = 601038, value = "User {} is getting journal file size on target resource: {}", level = LogMessage.Level.INFO)
+ void getJournalFileSize(String user, Object source);
static void getJournalMinFiles(Object source) {
BASE_LOGGER.getJournalMinFiles(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601039, value = "User {0} is getting journal min files on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getJournalMinFiles(String user, Object source, Object... args);
+ @LogMessage(id = 601039, value = "User {} is getting journal min files on target resource: {}", level = LogMessage.Level.INFO)
+ void getJournalMinFiles(String user, Object source);
static void getJournalCompactMinFiles(Object source) {
BASE_LOGGER.getJournalCompactMinFiles(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601040, value = "User {0} is getting journal compact min files on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getJournalCompactMinFiles(String user, Object source, Object... args);
+ @LogMessage(id = 601040, value = "User {} is getting journal compact min files on target resource: {}", level = LogMessage.Level.INFO)
+ void getJournalCompactMinFiles(String user, Object source);
static void getJournalCompactPercentage(Object source) {
BASE_LOGGER.getJournalCompactPercentage(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601041, value = "User {0} is getting journal compact percentage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getJournalCompactPercentage(String user, Object source, Object... args);
+ @LogMessage(id = 601041, value = "User {} is getting journal compact percentage on target resource: {}", level = LogMessage.Level.INFO)
+ void getJournalCompactPercentage(String user, Object source);
static void isPersistenceEnabled(Object source) {
BASE_LOGGER.isPersistenceEnabled(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601042, value = "User {0} is querying persistence enabled on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isPersistenceEnabled(String user, Object source, Object... args);
+ @LogMessage(id = 601042, value = "User {} is querying persistence enabled on target resource: {}", level = LogMessage.Level.INFO)
+ void isPersistenceEnabled(String user, Object source);
static void getJournalType(Object source) {
BASE_LOGGER.getJournalType(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601043, value = "User {0} is getting journal type on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getJournalType(String user, Object source, Object... args);
+ @LogMessage(id = 601043, value = "User {} is getting journal type on target resource: {}", level = LogMessage.Level.INFO)
+ void getJournalType(String user, Object source);
static void getPagingDirectory(Object source) {
BASE_LOGGER.getPagingDirectory(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601044, value = "User {0} is getting paging directory on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getPagingDirectory(String user, Object source, Object... args);
+ @LogMessage(id = 601044, value = "User {} is getting paging directory on target resource: {}", level = LogMessage.Level.INFO)
+ void getPagingDirectory(String user, Object source);
static void getScheduledThreadPoolMaxSize(Object source) {
BASE_LOGGER.getScheduledThreadPoolMaxSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601045, value = "User {0} is getting scheduled threadpool max size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getScheduledThreadPoolMaxSize(String user, Object source, Object... args);
+ @LogMessage(id = 601045, value = "User {} is getting scheduled threadpool max size on target resource: {}", level = LogMessage.Level.INFO)
+ void getScheduledThreadPoolMaxSize(String user, Object source);
static void getThreadPoolMaxSize(Object source) {
BASE_LOGGER.getThreadPoolMaxSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601046, value = "User {0} is getting threadpool max size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getThreadPoolMaxSize(String user, Object source, Object... args);
+ @LogMessage(id = 601046, value = "User {} is getting threadpool max size on target resource: {}", level = LogMessage.Level.INFO)
+ void getThreadPoolMaxSize(String user, Object source);
static void getSecurityInvalidationInterval(Object source) {
BASE_LOGGER.getSecurityInvalidationInterval(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601047, value = "User {0} is getting security invalidation interval on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getSecurityInvalidationInterval(String user, Object source, Object... args);
+ @LogMessage(id = 601047, value = "User {} is getting security invalidation interval on target resource: {}", level = LogMessage.Level.INFO)
+ void getSecurityInvalidationInterval(String user, Object source);
static void isClustered(Object source) {
BASE_LOGGER.isClustered(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601048, value = "User {0} is querying is-clustered on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isClustered(String user, Object source, Object... args);
+ @LogMessage(id = 601048, value = "User {} is querying is-clustered on target resource: {}", level = LogMessage.Level.INFO)
+ void isClustered(String user, Object source);
static void isCreateBindingsDir(Object source) {
BASE_LOGGER.isCreateBindingsDir(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601049, value = "User {0} is querying is-create-bindings-dir on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isCreateBindingsDir(String user, Object source, Object... args);
+ @LogMessage(id = 601049, value = "User {} is querying is-create-bindings-dir on target resource: {}", level = LogMessage.Level.INFO)
+ void isCreateBindingsDir(String user, Object source);
static void isCreateJournalDir(Object source) {
BASE_LOGGER.isCreateJournalDir(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601050, value = "User {0} is querying is-create-journal-dir on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isCreateJournalDir(String user, Object source, Object... args);
+ @LogMessage(id = 601050, value = "User {} is querying is-create-journal-dir on target resource: {}", level = LogMessage.Level.INFO)
+ void isCreateJournalDir(String user, Object source);
static void isJournalSyncNonTransactional(Object source) {
BASE_LOGGER.isJournalSyncNonTransactional(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601051, value = "User {0} is querying is-journal-sync-non-transactional on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isJournalSyncNonTransactional(String user, Object source, Object... args);
+ @LogMessage(id = 601051, value = "User {} is querying is-journal-sync-non-transactional on target resource: {}", level = LogMessage.Level.INFO)
+ void isJournalSyncNonTransactional(String user, Object source);
static void isJournalSyncTransactional(Object source) {
BASE_LOGGER.isJournalSyncTransactional(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601052, value = "User {0} is querying is-journal-sync-transactional on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isJournalSyncTransactional(String user, Object source, Object... args);
+ @LogMessage(id = 601052, value = "User {} is querying is-journal-sync-transactional on target resource: {}", level = LogMessage.Level.INFO)
+ void isJournalSyncTransactional(String user, Object source);
static void isSecurityEnabled(Object source) {
BASE_LOGGER.isSecurityEnabled(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601053, value = "User {0} is querying is-security-enabled on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isSecurityEnabled(String user, Object source, Object... args);
+ @LogMessage(id = 601053, value = "User {} is querying is-security-enabled on target resource: {}", level = LogMessage.Level.INFO)
+ void isSecurityEnabled(String user, Object source);
static void isAsyncConnectionExecutionEnabled(Object source) {
BASE_LOGGER.isAsyncConnectionExecutionEnabled(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601054, value = "User {0} is query is-async-connection-execution-enabled on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isAsyncConnectionExecutionEnabled(String user, Object source, Object... args);
+ @LogMessage(id = 601054, value = "User {} is query is-async-connection-execution-enabled on target resource: {}", level = LogMessage.Level.INFO)
+ void isAsyncConnectionExecutionEnabled(String user, Object source);
static void getDiskScanPeriod(Object source) {
BASE_LOGGER.getDiskScanPeriod(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601055, value = "User {0} is getting disk scan period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDiskScanPeriod(String user, Object source, Object... args);
+ @LogMessage(id = 601055, value = "User {} is getting disk scan period on target resource: {}", level = LogMessage.Level.INFO)
+ void getDiskScanPeriod(String user, Object source);
static void getMaxDiskUsage(Object source) {
BASE_LOGGER.getMaxDiskUsage(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601056, value = "User {0} is getting max disk usage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMaxDiskUsage(String user, Object source, Object... args);
+ @LogMessage(id = 601056, value = "User {} is getting max disk usage on target resource: {}", level = LogMessage.Level.INFO)
+ void getMaxDiskUsage(String user, Object source);
static void getGlobalMaxSize(Object source) {
BASE_LOGGER.getGlobalMaxSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601057, value = "User {0} is getting global max size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getGlobalMaxSize(String user, Object source, Object... args);
+ @LogMessage(id = 601057, value = "User {} is getting global max size on target resource: {}", level = LogMessage.Level.INFO)
+ void getGlobalMaxSize(String user, Object source);
static void getAddressMemoryUsage(Object source) {
BASE_LOGGER.getAddressMemoryUsage(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601058, value = "User {0} is getting address memory usage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAddressMemoryUsage(String user, Object source, Object... args);
+ @LogMessage(id = 601058, value = "User {} is getting address memory usage on target resource: {}", level = LogMessage.Level.INFO)
+ void getAddressMemoryUsage(String user, Object source);
static void getAddressMemoryUsagePercentage(Object source) {
BASE_LOGGER.getAddressMemoryUsagePercentage(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601059, value = "User {0} is getting address memory usage percentage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAddressMemoryUsagePercentage(String user, Object source, Object... args);
+ @LogMessage(id = 601059, value = "User {} is getting address memory usage percentage on target resource: {}", level = LogMessage.Level.INFO)
+ void getAddressMemoryUsagePercentage(String user, Object source);
static void freezeReplication(Object source) {
BASE_LOGGER.freezeReplication(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601060, value = "User {0} is freezing replication on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void freezeReplication(String user, Object source, Object... args);
+ @LogMessage(id = 601060, value = "User {} is freezing replication on target resource: {}", level = LogMessage.Level.INFO)
+ void freezeReplication(String user, Object source);
static void createAddress(Object source, Object... args) {
- BASE_LOGGER.createAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.createAddress(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601061, value = "User {0} is creating an address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void createAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601061, value = "User {} is creating an address on target resource: {} {}", level = LogMessage.Level.INFO)
+ void createAddress(String user, Object source, String args);
static void updateAddress(Object source, Object... args) {
- BASE_LOGGER.updateAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.updateAddress(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601062, value = "User {0} is updating an address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void updateAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601062, value = "User {} is updating an address on target resource: {} {}", level = LogMessage.Level.INFO)
+ void updateAddress(String user, Object source, String args);
static void deleteAddress(Object source, Object... args) {
- BASE_LOGGER.deleteAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.deleteAddress(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601063, value = "User {0} is deleting an address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void deleteAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601063, value = "User {} is deleting an address on target resource: {} {}", level = LogMessage.Level.INFO)
+ void deleteAddress(String user, Object source, String args);
static void deployQueue(Object source, Object... args) {
- BASE_LOGGER.deployQueue(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.deployQueue(getCaller(), source, parametersList(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);
+ @LogMessage(id = 601064, value = "User {} is creating a queue on target resource: {} {}", level = LogMessage.Level.INFO)
+ void deployQueue(String user, Object source, String args);
static void createQueue(Object source, Subject user, String remoteAddress, Object... args) {
- RESOURCE_LOGGER.createQueue(getCaller(user, remoteAddress), source, arrayToString(args));
+ RESOURCE_LOGGER.createQueue(getCaller(user, remoteAddress), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601065, value = "User {0} is creating a queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void createQueue(String user, Object source, Object... args);
+ @LogMessage(id = 601065, value = "User {} is creating a queue on target resource: {} {}", level = LogMessage.Level.INFO)
+ void createQueue(String user, Object source, String args);
static void updateQueue(Object source, Object... args) {
- BASE_LOGGER.updateQueue(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.updateQueue(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601066, value = "User {0} is updating a queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void updateQueue(String user, Object source, Object... args);
+ @LogMessage(id = 601066, value = "User {} is updating a queue on target resource: {} {}", level = LogMessage.Level.INFO)
+ void updateQueue(String user, Object source, String args);
static void getClusterConnectionNames(Object source) {
BASE_LOGGER.getClusterConnectionNames(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601067, value = "User {0} is getting cluster connection names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getClusterConnectionNames(String user, Object source, Object... args);
+ @LogMessage(id = 601067, value = "User {} is getting cluster connection names on target resource: {}", level = LogMessage.Level.INFO)
+ void getClusterConnectionNames(String user, Object source);
static void getUptime(Object source) {
BASE_LOGGER.getUptime(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601068, value = "User {0} is getting uptime on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getUptime(String user, Object source, Object... args);
+ @LogMessage(id = 601068, value = "User {} is getting uptime on target resource: {}", level = LogMessage.Level.INFO)
+ void getUptime(String user, Object source);
static void getUptimeMillis(Object source) {
BASE_LOGGER.getUptimeMillis(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601069, value = "User {0} is getting uptime in milliseconds on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getUptimeMillis(String user, Object source, Object... args);
+ @LogMessage(id = 601069, value = "User {} is getting uptime in milliseconds on target resource: {}", level = LogMessage.Level.INFO)
+ void getUptimeMillis(String user, Object source);
static void isReplicaSync(Object source) {
BASE_LOGGER.isReplicaSync(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601070, value = "User {0} is querying is-replica-sync on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isReplicaSync(String user, Object source, Object... args);
+ @LogMessage(id = 601070, value = "User {} is querying is-replica-sync on target resource: {}", level = LogMessage.Level.INFO)
+ void isReplicaSync(String user, Object source);
static void getAddressNames(Object 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);
+ @LogMessage(id = 601071, value = "User {} is getting address names on target resource: {}", level = LogMessage.Level.INFO)
+ void getAddressNames(String user, Object source);
static void destroyQueue(Object source, Subject user, String remoteAddress, Object... args) {
- BASE_LOGGER.destroyQueue(getCaller(user, remoteAddress), source, arrayToString(args));
+ BASE_LOGGER.destroyQueue(getCaller(user, remoteAddress), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601072, value = "User {0} is deleting a queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void destroyQueue(String user, Object source, Object... args);
+ @LogMessage(id = 601072, value = "User {} is deleting a queue on target resource: {} {}", level = LogMessage.Level.INFO)
+ void destroyQueue(String user, Object source, String args);
static void getAddressInfo(Object source, Object... args) {
- BASE_LOGGER.getAddressInfo(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getAddressInfo(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601073, value = "User {0} is getting address info on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAddressInfo(String user, Object source, Object... args);
+ @LogMessage(id = 601073, value = "User {} is getting address info on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getAddressInfo(String user, Object source, String args);
static void listBindingsForAddress(Object source, Object... args) {
- BASE_LOGGER.listBindingsForAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listBindingsForAddress(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601074, value = "User {0} is listing bindings for address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listBindingsForAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601074, value = "User {} is listing bindings for address on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listBindingsForAddress(String user, Object source, String args);
static void listAddresses(Object source, Object... args) {
- BASE_LOGGER.listAddresses(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listAddresses(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601075, value = "User {0} is listing addresses on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listAddresses(String user, Object source, Object... args);
+ @LogMessage(id = 601075, value = "User {} is listing addresses on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listAddresses(String user, Object source, String args);
static void getConnectionCount(Object source, Object... args) {
- BASE_LOGGER.getConnectionCount(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getConnectionCount(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601076, value = "User {0} is getting connection count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getConnectionCount(String user, Object source, Object... args);
+ @LogMessage(id = 601076, value = "User {} is getting connection count on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getConnectionCount(String user, Object source, String args);
static void getTotalConnectionCount(Object source) {
BASE_LOGGER.getTotalConnectionCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601077, value = "User {0} is getting total connection count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTotalConnectionCount(String user, Object source, Object... args);
+ @LogMessage(id = 601077, value = "User {} is getting total connection count on target resource: {}", level = LogMessage.Level.INFO)
+ void getTotalConnectionCount(String user, Object source);
static void getTotalMessageCount(Object source) {
BASE_LOGGER.getTotalMessageCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601078, value = "User {0} is getting total message count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTotalMessageCount(String user, Object source, Object... args);
+ @LogMessage(id = 601078, value = "User {} is getting total message count on target resource: {}", level = LogMessage.Level.INFO)
+ void getTotalMessageCount(String user, Object source);
static void getTotalMessagesAdded(Object source) {
BASE_LOGGER.getTotalMessagesAdded(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601079, value = "User {0} is getting total messages added on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTotalMessagesAdded(String user, Object source, Object... args);
+ @LogMessage(id = 601079, value = "User {} is getting total messages added on target resource: {}", level = LogMessage.Level.INFO)
+ void getTotalMessagesAdded(String user, Object source);
static void getTotalMessagesAcknowledged(Object source) {
BASE_LOGGER.getTotalMessagesAcknowledged(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601080, value = "User {0} is getting total messages acknowledged on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTotalMessagesAcknowledged(String user, Object source, Object... args);
+ @LogMessage(id = 601080, value = "User {} is getting total messages acknowledged on target resource: {}", level = LogMessage.Level.INFO)
+ void getTotalMessagesAcknowledged(String user, Object source);
static void getTotalConsumerCount(Object source) {
BASE_LOGGER.getTotalConsumerCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601081, value = "User {0} is getting total consumer count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTotalConsumerCount(String user, Object source, Object... args);
+ @LogMessage(id = 601081, value = "User {} is getting total consumer count on target resource: {}", level = LogMessage.Level.INFO)
+ void getTotalConsumerCount(String user, Object source);
static void enableMessageCounters(Object source) {
BASE_LOGGER.enableMessageCounters(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601082, value = "User {0} is enabling message counters on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void enableMessageCounters(String user, Object source, Object... args);
+ @LogMessage(id = 601082, value = "User {} is enabling message counters on target resource: {}", level = LogMessage.Level.INFO)
+ void enableMessageCounters(String user, Object source);
static void disableMessageCounters(Object source) {
BASE_LOGGER.disableMessageCounters(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601083, value = "User {0} is disabling message counters on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void disableMessageCounters(String user, Object source, Object... args);
+ @LogMessage(id = 601083, value = "User {} is disabling message counters on target resource: {}", level = LogMessage.Level.INFO)
+ void disableMessageCounters(String user, Object source);
static void resetAllMessageCounters(Object source) {
BASE_LOGGER.resetAllMessageCounters(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601084, value = "User {0} is resetting all message counters on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resetAllMessageCounters(String user, Object source, Object... args);
+ @LogMessage(id = 601084, value = "User {} is resetting all message counters on target resource: {}", level = LogMessage.Level.INFO)
+ void resetAllMessageCounters(String user, Object source);
static void resetAllMessageCounterHistories(Object source) {
BASE_LOGGER.resetAllMessageCounterHistories(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601085, value = "User {0} is resetting all message counter histories on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resetAllMessageCounterHistories(String user, Object source, Object... args);
+ @LogMessage(id = 601085, value = "User {} is resetting all message counter histories on target resource: {}", level = LogMessage.Level.INFO)
+ void resetAllMessageCounterHistories(String user, Object source);
static void isMessageCounterEnabled(Object source) {
BASE_LOGGER.isMessageCounterEnabled(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601086, value = "User {0} is querying is-message-counter-enabled on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isMessageCounterEnabled(String user, Object source, Object... args);
+ @LogMessage(id = 601086, value = "User {} is querying is-message-counter-enabled on target resource: {}", level = LogMessage.Level.INFO)
+ void isMessageCounterEnabled(String user, Object source);
static void getMessageCounterSamplePeriod(Object source) {
BASE_LOGGER.getMessageCounterSamplePeriod(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601087, value = "User {0} is getting message counter sample period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessageCounterSamplePeriod(String user, Object source, Object... args);
+ @LogMessage(id = 601087, value = "User {} is getting message counter sample period on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessageCounterSamplePeriod(String user, Object source);
static void setMessageCounterSamplePeriod(Object source, Object... args) {
- BASE_LOGGER.setMessageCounterSamplePeriod(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.setMessageCounterSamplePeriod(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601088, value = "User {0} is setting message counter sample period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void setMessageCounterSamplePeriod(String user, Object source, Object... args);
+ @LogMessage(id = 601088, value = "User {} is setting message counter sample period on target resource: {} {}", level = LogMessage.Level.INFO)
+ void setMessageCounterSamplePeriod(String user, Object source, String args);
static void getMessageCounterMaxDayCount(Object source) {
BASE_LOGGER.getMessageCounterMaxDayCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601089, value = "User {0} is getting message counter max day count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessageCounterMaxDayCount(String user, Object source, Object... args);
+ @LogMessage(id = 601089, value = "User {} is getting message counter max day count on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessageCounterMaxDayCount(String user, Object source);
static void setMessageCounterMaxDayCount(Object source, Object... args) {
- BASE_LOGGER.setMessageCounterMaxDayCount(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.setMessageCounterMaxDayCount(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601090, value = "User {0} is setting message counter max day count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void setMessageCounterMaxDayCount(String user, Object source, Object... args);
+ @LogMessage(id = 601090, value = "User {} is setting message counter max day count on target resource: {} {}", level = LogMessage.Level.INFO)
+ void setMessageCounterMaxDayCount(String user, Object source, String args);
static void listPreparedTransactions(Object source) {
BASE_LOGGER.listPreparedTransactions(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601091, value = "User {0} is listing prepared transactions on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listPreparedTransactions(String user, Object source, Object... args);
+ @LogMessage(id = 601091, value = "User {} is listing prepared transactions on target resource: {}", level = LogMessage.Level.INFO)
+ void listPreparedTransactions(String user, Object source);
static void listPreparedTransactionDetailsAsJSON(Object source) {
BASE_LOGGER.listPreparedTransactionDetailsAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601092, value = "User {0} is listing prepared transaction details as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listPreparedTransactionDetailsAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601092, value = "User {} is listing prepared transaction details as json on target resource: {}", level = LogMessage.Level.INFO)
+ void listPreparedTransactionDetailsAsJSON(String user, Object source);
static void listPreparedTransactionDetailsAsHTML(Object source, Object... args) {
- BASE_LOGGER.listPreparedTransactionDetailsAsHTML(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listPreparedTransactionDetailsAsHTML(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601093, value = "User {0} is listing prepared transaction details as HTML on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listPreparedTransactionDetailsAsHTML(String user, Object source, Object... args);
+ @LogMessage(id = 601093, value = "User {} is listing prepared transaction details as HTML on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listPreparedTransactionDetailsAsHTML(String user, Object source, String args);
static void listHeuristicCommittedTransactions(Object source) {
BASE_LOGGER.listHeuristicCommittedTransactions(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601094, value = "User {0} is listing heuristic committed transactions on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listHeuristicCommittedTransactions(String user, Object source, Object... args);
+ @LogMessage(id = 601094, value = "User {} is listing heuristic committed transactions on target resource: {}", level = LogMessage.Level.INFO)
+ void listHeuristicCommittedTransactions(String user, Object source);
static void listHeuristicRolledBackTransactions(Object source) {
BASE_LOGGER.listHeuristicRolledBackTransactions(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601095, value = "User {0} is listing heuristic rolled back transactions on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listHeuristicRolledBackTransactions(String user, Object source, Object... args);
+ @LogMessage(id = 601095, value = "User {} is listing heuristic rolled back transactions on target resource: {}", level = LogMessage.Level.INFO)
+ void listHeuristicRolledBackTransactions(String user, Object source);
static void commitPreparedTransaction(Object source, Object... args) {
- BASE_LOGGER.commitPreparedTransaction(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.commitPreparedTransaction(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601096, value = "User {0} is commiting prepared transaction on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void commitPreparedTransaction(String user, Object source, Object... args);
+ @LogMessage(id = 601096, value = "User {} is commiting prepared transaction on target resource: {} {}", level = LogMessage.Level.INFO)
+ void commitPreparedTransaction(String user, Object source, String args);
static void rollbackPreparedTransaction(Object source, Object... args) {
- BASE_LOGGER.rollbackPreparedTransaction(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.rollbackPreparedTransaction(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601097, value = "User {0} is rolling back prepared transaction on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void rollbackPreparedTransaction(String user, Object source, Object... args);
+ @LogMessage(id = 601097, value = "User {} is rolling back prepared transaction on target resource: {} {}", level = LogMessage.Level.INFO)
+ void rollbackPreparedTransaction(String user, Object source, String args);
static void listRemoteAddresses(Object source, Object... args) {
- BASE_LOGGER.listRemoteAddresses(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listRemoteAddresses(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601098, value = "User {0} is listing remote addresses on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listRemoteAddresses(String user, Object source, Object... args);
+ @LogMessage(id = 601098, value = "User {} is listing remote addresses on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listRemoteAddresses(String user, Object source, String args);
static void closeConnectionsForAddress(Object source, Object... args) {
- BASE_LOGGER.closeConnectionsForAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeConnectionsForAddress(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601099, value = "User {0} is closing connections for address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void closeConnectionsForAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601099, value = "User {} is closing connections for address on target resource: {} {}", level = LogMessage.Level.INFO)
+ void closeConnectionsForAddress(String user, Object source, String args);
static void closeConsumerConnectionsForAddress(Object source, Object... args) {
- BASE_LOGGER.closeConsumerConnectionsForAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeConsumerConnectionsForAddress(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601100, value = "User {0} is closing consumer connections for address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void closeConsumerConnectionsForAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601100, value = "User {} is closing consumer connections for address on target resource: {} {}", level = LogMessage.Level.INFO)
+ void closeConsumerConnectionsForAddress(String user, Object source, String args);
static void closeConnectionsForUser(Object source, Object... args) {
- BASE_LOGGER.closeConnectionsForUser(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeConnectionsForUser(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601101, value = "User {0} is closing connections for user on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void closeConnectionsForUser(String user, Object source, Object... args);
+ @LogMessage(id = 601101, value = "User {} is closing connections for user on target resource: {} {}", level = LogMessage.Level.INFO)
+ void closeConnectionsForUser(String user, Object source, String args);
static void closeConnectionWithID(Object source, Object... args) {
- BASE_LOGGER.closeConnectionWithID(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeConnectionWithID(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601102, value = "User {0} is closing a connection by ID on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void closeConnectionWithID(String user, Object source, Object... args);
+ @LogMessage(id = 601102, value = "User {} is closing a connection by ID on target resource: {} {}", level = LogMessage.Level.INFO)
+ void closeConnectionWithID(String user, Object source, String args);
static void closeSessionWithID(Object source, Object... args) {
- BASE_LOGGER.closeSessionWithID(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeSessionWithID(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601103, value = "User {0} is closing session with id on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void closeSessionWithID(String user, Object source, Object... args);
+ @LogMessage(id = 601103, value = "User {} is closing session with id on target resource: {} {}", level = LogMessage.Level.INFO)
+ void closeSessionWithID(String user, Object source, String args);
static void closeConsumerWithID(Object source, Object... args) {
- BASE_LOGGER.closeConsumerWithID(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.closeConsumerWithID(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601104, value = "User {0} is closing consumer with id on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void closeConsumerWithID(String user, Object source, Object... args);
+ @LogMessage(id = 601104, value = "User {} is closing consumer with id on target resource: {} {}", level = LogMessage.Level.INFO)
+ void closeConsumerWithID(String user, Object source, String args);
static void listConnectionIDs(Object source) {
BASE_LOGGER.listConnectionIDs(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601105, value = "User {0} is listing connection IDs on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listConnectionIDs(String user, Object source, Object... args);
+ @LogMessage(id = 601105, value = "User {} is listing connection IDs on target resource: {}", level = LogMessage.Level.INFO)
+ void listConnectionIDs(String user, Object source);
static void listSessions(Object source, Object... args) {
- BASE_LOGGER.listSessions(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listSessions(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601106, value = "User {0} is listing sessions on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listSessions(String user, Object source, Object... args);
+ @LogMessage(id = 601106, value = "User {} is listing sessions on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listSessions(String user, Object source, String args);
static void listProducersInfoAsJSON(Object source) {
BASE_LOGGER.listProducersInfoAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601107, value = "User {0} is listing producers info as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listProducersInfoAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601107, value = "User {} is listing producers info as json on target resource: {}", level = LogMessage.Level.INFO)
+ void listProducersInfoAsJSON(String user, Object source);
static void listConnections(Object source, Object... args) {
- BASE_LOGGER.listConnections(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listConnections(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601108, value = "User {0} is listing connections on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listConnections(String user, Object source, Object... args);
+ @LogMessage(id = 601108, value = "User {} is listing connections on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listConnections(String user, Object source, String args);
static void listConsumers(Object source, Object... args) {
- BASE_LOGGER.listConsumers(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listConsumers(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601109, value = "User {0} is listing consumers on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listConsumers(String user, Object source, Object... args);
+ @LogMessage(id = 601109, value = "User {} is listing consumers on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listConsumers(String user, Object source, String args);
static void listQueues(Object source, Object... args) {
- BASE_LOGGER.listQueues(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listQueues(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601110, value = "User {0} is listing queues on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listQueues(String user, Object source, Object... args);
+ @LogMessage(id = 601110, value = "User {} is listing queues on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listQueues(String user, Object source, String arg);
static void listProducers(Object source, Object... args) {
- BASE_LOGGER.listProducers(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listProducers(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601111, value = "User {0} is listing producers on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listProducers(String user, Object source, Object... args);
+ @LogMessage(id = 601111, value = "User {} is listing producers on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listProducers(String user, Object source, String args);
static void listConnectionsAsJSON(Object source) {
BASE_LOGGER.listConnectionsAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601112, value = "User {0} is listing connections as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listConnectionsAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601112, value = "User {} is listing connections as json on target resource: {}", level = LogMessage.Level.INFO)
+ void listConnectionsAsJSON(String user, Object source);
static void listSessionsAsJSON(Object source, Object... args) {
- BASE_LOGGER.listSessionsAsJSON(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listSessionsAsJSON(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601113, value = "User {0} is listing sessions as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listSessionsAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601113, value = "User {} is listing sessions as json on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listSessionsAsJSON(String user, Object source, String args);
static void listAllSessionsAsJSON(Object source) {
BASE_LOGGER.listAllSessionsAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601114, value = "User {0} is listing all sessions as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listAllSessionsAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601114, value = "User {} is listing all sessions as json on target resource: {}", level = LogMessage.Level.INFO)
+ void listAllSessionsAsJSON(String user, Object source);
static void listConsumersAsJSON(Object source, Object... args) {
- BASE_LOGGER.listConsumersAsJSON(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listConsumersAsJSON(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601115, value = "User {0} is listing consumers as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listConsumersAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601115, value = "User {} is listing consumers as json on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listConsumersAsJSON(String user, Object source, String args);
static void listAllConsumersAsJSON(Object source) {
BASE_LOGGER.listAllConsumersAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601116, value = "User {0} is listing all consumers as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listAllConsumersAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601116, value = "User {} is listing all consumers as json on target resource: {}", level = LogMessage.Level.INFO)
+ void listAllConsumersAsJSON(String user, Object source);
static void getConnectors(Object source) {
BASE_LOGGER.getConnectors(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601117, value = "User {0} is getting connectors on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getConnectors(String user, Object source, Object... args);
+ @LogMessage(id = 601117, value = "User {} is getting connectors on target resource: {}", level = LogMessage.Level.INFO)
+ void getConnectors(String user, Object source);
static void getConnectorsAsJSON(Object source) {
BASE_LOGGER.getConnectorsAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601118, value = "User {0} is getting connectors as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getConnectorsAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601118, value = "User {} is getting connectors as json on target resource: {}", level = LogMessage.Level.INFO)
+ void getConnectorsAsJSON(String user, Object source);
static void addSecuritySettings(Object source, Object... args) {
- BASE_LOGGER.addSecuritySettings(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.addSecuritySettings(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601119, value = "User {0} is adding security settings on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void addSecuritySettings(String user, Object source, Object... args);
+ @LogMessage(id = 601119, value = "User {} is adding security settings on target resource: {} {}", level = LogMessage.Level.INFO)
+ void addSecuritySettings(String user, Object source, String args);
static void removeSecuritySettings(Object source, Object... args) {
- BASE_LOGGER.removeSecuritySettings(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeSecuritySettings(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601120, value = "User {0} is removing security settings on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void removeSecuritySettings(String user, Object source, Object... args);
+ @LogMessage(id = 601120, value = "User {} is removing security settings on target resource: {} {}", level = LogMessage.Level.INFO)
+ void removeSecuritySettings(String user, Object source, String args);
static void getAddressSettingsAsJSON(Object source, Object... args) {
- BASE_LOGGER.getAddressSettingsAsJSON(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getAddressSettingsAsJSON(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601121, value = "User {0} is getting address settings as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAddressSettingsAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601121, value = "User {} is getting address settings as json on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getAddressSettingsAsJSON(String user, Object source, String args);
static void addAddressSettings(Object source, Object... args) {
- BASE_LOGGER.addAddressSettings(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.addAddressSettings(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601122, value = "User {0} is adding addressSettings on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void addAddressSettings(String user, Object source, Object... args);
+ @LogMessage(id = 601122, value = "User {} is adding addressSettings on target resource: {} {}", level = LogMessage.Level.INFO)
+ void addAddressSettings(String user, Object source, String args);
static void removeAddressSettings(Object source, Object... args) {
- BASE_LOGGER.removeAddressSettings(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeAddressSettings(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601123, value = "User {0} is removing address settings on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void removeAddressSettings(String user, Object source, Object... args);
+ @LogMessage(id = 601123, value = "User {} is removing address settings on target resource: {} {}", level = LogMessage.Level.INFO)
+ void removeAddressSettings(String user, Object source, String args);
static void getDivertNames(Object source) {
BASE_LOGGER.getDivertNames(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601124, value = "User {0} is getting divert names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDivertNames(String user, Object source, Object... args);
+ @LogMessage(id = 601124, value = "User {} is getting divert names on target resource: {}", level = LogMessage.Level.INFO)
+ void getDivertNames(String user, Object source);
static void createDivert(Object source, Object... args) {
- BASE_LOGGER.createDivert(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.createDivert(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601125, value = "User {0} is creating a divert on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void createDivert(String user, Object source, Object... args);
+ @LogMessage(id = 601125, value = "User {} is creating a divert on target resource: {} {}", level = LogMessage.Level.INFO)
+ void createDivert(String user, Object source, String args);
static void destroyDivert(Object source, Object... args) {
- BASE_LOGGER.destroyDivert(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.destroyDivert(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601126, value = "User {0} is destroying a divert on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void destroyDivert(String user, Object source, Object... args);
+ @LogMessage(id = 601126, value = "User {} is destroying a divert on target resource: {} {}", level = LogMessage.Level.INFO)
+ void destroyDivert(String user, Object source, String args);
static void getBridgeNames(Object source) {
BASE_LOGGER.getBridgeNames(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601127, value = "User {0} is getting bridge names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getBridgeNames(String user, Object source, Object... args);
+ @LogMessage(id = 601127, value = "User {} is getting bridge names on target resource: {}", level = LogMessage.Level.INFO)
+ void getBridgeNames(String user, Object source);
static void createBridge(Object source, Object... args) {
- BASE_LOGGER.createBridge(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.createBridge(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601128, value = "User {0} is creating a bridge on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void createBridge(String user, Object source, Object... args);
+ @LogMessage(id = 601128, value = "User {} is creating a bridge on target resource: {} {}", level = LogMessage.Level.INFO)
+ void createBridge(String user, Object source, String args);
static void destroyBridge(Object source, Object... args) {
- BASE_LOGGER.destroyBridge(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.destroyBridge(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601129, value = "User {0} is destroying a bridge on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void destroyBridge(String user, Object source, Object... args);
+ @LogMessage(id = 601129, value = "User {} is destroying a bridge on target resource: {} {}", level = LogMessage.Level.INFO)
+ void destroyBridge(String user, Object source, String args);
static void createConnectorService(Object source, Object... args) {
- BASE_LOGGER.createConnectorService(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.createConnectorService(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601130, value = "User {0} is creating connector service on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void createConnectorService(String user, Object source, Object... args);
+ @LogMessage(id = 601130, value = "User {} is creating connector service on target resource: {} {}", level = LogMessage.Level.INFO)
+ void createConnectorService(String user, Object source, String args);
static void destroyConnectorService(Object source, Object... args) {
- BASE_LOGGER.destroyConnectorService(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.destroyConnectorService(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601131, value = "User {0} is destroying connector service on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void destroyConnectorService(String user, Object source, Object... args);
+ @LogMessage(id = 601131, value = "User {} is destroying connector service on target resource: {} {}", level = LogMessage.Level.INFO)
+ void destroyConnectorService(String user, Object source, String args);
static void getConnectorServices(Object source, Object... args) {
- BASE_LOGGER.getConnectorServices(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getConnectorServices(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601132, value = "User {0} is getting connector services on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getConnectorServices(String user, Object source, Object... args);
+ @LogMessage(id = 601132, value = "User {} is getting connector services on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getConnectorServices(String user, Object source, String args);
static void forceFailover(Object source) {
BASE_LOGGER.forceFailover(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601133, value = "User {0} is forceing a failover on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void forceFailover(String user, Object source, Object... args);
+ @LogMessage(id = 601133, value = "User {} is forceing a failover on target resource: {}", level = LogMessage.Level.INFO)
+ void forceFailover(String user, Object source);
static void scaleDown(Object source, Object... args) {
- BASE_LOGGER.scaleDown(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.scaleDown(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601134, value = "User {0} is performing scale down on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void scaleDown(String user, Object source, Object... args);
+ @LogMessage(id = 601134, value = "User {} is performing scale down on target resource: {} {}", level = LogMessage.Level.INFO)
+ void scaleDown(String user, Object source, String args);
static void listNetworkTopology(Object source) {
BASE_LOGGER.listNetworkTopology(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601135, value = "User {0} is listing network topology on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listNetworkTopology(String user, Object source, Object... args);
+ @LogMessage(id = 601135, value = "User {} is listing network topology on target resource: {}", level = LogMessage.Level.INFO)
+ void listNetworkTopology(String user, Object source);
static void removeNotificationListener(Object source, Object... args) {
- BASE_LOGGER.removeNotificationListener(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeNotificationListener(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601136, value = "User {0} is removing notification listener on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void removeNotificationListener(String user, Object source, Object... args);
+ @LogMessage(id = 601136, value = "User {} is removing notification listener on target resource: {} {}", level = LogMessage.Level.INFO)
+ void removeNotificationListener(String user, Object source, String args);
static void addNotificationListener(Object source, Object... args) {
- BASE_LOGGER.addNotificationListener(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.addNotificationListener(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601137, value = "User {0} is adding notification listener on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void addNotificationListener(String user, Object source, Object... args);
+ @LogMessage(id = 601137, value = "User {} is adding notification listener on target resource: {} {}", level = LogMessage.Level.INFO)
+ void addNotificationListener(String user, Object source, String args);
static void getNotificationInfo(Object source) {
BASE_LOGGER.getNotificationInfo(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601138, value = "User {0} is getting notification info on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getNotificationInfo(String user, Object source, Object... args);
+ @LogMessage(id = 601138, value = "User {} is getting notification info on target resource: {}", level = LogMessage.Level.INFO)
+ void getNotificationInfo(String user, Object source);
static void getConnectionTTLOverride(Object source) {
BASE_LOGGER.getConnectionTTLOverride(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601139, value = "User {0} is getting connection ttl override on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getConnectionTTLOverride(String user, Object source, Object... args);
+ @LogMessage(id = 601139, value = "User {} is getting connection ttl override on target resource: {}", level = LogMessage.Level.INFO)
+ void getConnectionTTLOverride(String user, Object source);
static void getIDCacheSize(Object source) {
BASE_LOGGER.getIDCacheSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601140, value = "User {0} is getting ID cache size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getIDCacheSize(String user, Object source, Object... args);
+ @LogMessage(id = 601140, value = "User {} is getting ID cache size on target resource: {}", level = LogMessage.Level.INFO)
+ void getIDCacheSize(String user, Object source);
static void getLargeMessagesDirectory(Object source) {
BASE_LOGGER.getLargeMessagesDirectory(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601141, value = "User {0} is getting large message directory on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getLargeMessagesDirectory(String user, Object source, Object... args);
+ @LogMessage(id = 601141, value = "User {} is getting large message directory on target resource: {}", level = LogMessage.Level.INFO)
+ void getLargeMessagesDirectory(String user, Object source);
static void getManagementAddress(Object source) {
BASE_LOGGER.getManagementAddress(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601142, value = "User {0} is getting management address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getManagementAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601142, value = "User {} is getting management address on target resource: {}", level = LogMessage.Level.INFO)
+ void getManagementAddress(String user, Object source);
static void getNodeID(Object source) {
BASE_LOGGER.getNodeID(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601143, value = "User {0} is getting node ID on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getNodeID(String user, Object source, Object... args);
+ @LogMessage(id = 601143, value = "User {} is getting node ID on target resource: {}", level = LogMessage.Level.INFO)
+ void getNodeID(String user, Object source);
static void getManagementNotificationAddress(Object source) {
BASE_LOGGER.getManagementNotificationAddress(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601144, value = "User {0} is getting management notification address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getManagementNotificationAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601144, value = "User {} is getting management notification address on target resource: {}", level = LogMessage.Level.INFO)
+ void getManagementNotificationAddress(String user, Object source);
static void getMessageExpiryScanPeriod(Object source) {
BASE_LOGGER.getMessageExpiryScanPeriod(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601145, value = "User {0} is getting message expiry scan period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessageExpiryScanPeriod(String user, Object source, Object... args);
+ @LogMessage(id = 601145, value = "User {} is getting message expiry scan period on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessageExpiryScanPeriod(String user, Object source);
static void getMessageExpiryThreadPriority(Object source) {
BASE_LOGGER.getMessageExpiryThreadPriority(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601146, value = "User {0} is getting message expiry thread priority on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessageExpiryThreadPriority(String user, Object source, Object... args);
+ @LogMessage(id = 601146, value = "User {} is getting message expiry thread priority on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessageExpiryThreadPriority(String user, Object source);
static void getTransactionTimeout(Object source) {
BASE_LOGGER.getTransactionTimeout(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601147, value = "User {0} is getting transaction timeout on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTransactionTimeout(String user, Object source, Object... args);
+ @LogMessage(id = 601147, value = "User {} is getting transaction timeout on target resource: {}", level = LogMessage.Level.INFO)
+ void getTransactionTimeout(String user, Object source);
static void getTransactionTimeoutScanPeriod(Object source) {
BASE_LOGGER.getTransactionTimeoutScanPeriod(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601148, value = "User {0} is getting transaction timeout scan period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTransactionTimeoutScanPeriod(String user, Object source, Object... args);
+ @LogMessage(id = 601148, value = "User {} is getting transaction timeout scan period on target resource: {}", level = LogMessage.Level.INFO)
+ void getTransactionTimeoutScanPeriod(String user, Object source);
static void isPersistDeliveryCountBeforeDelivery(Object source) {
BASE_LOGGER.isPersistDeliveryCountBeforeDelivery(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601149, value = "User {0} is querying is-persist-delivery-before-delivery on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isPersistDeliveryCountBeforeDelivery(String user, Object source, Object... args);
+ @LogMessage(id = 601149, value = "User {} is querying is-persist-delivery-before-delivery on target resource: {}", level = LogMessage.Level.INFO)
+ void isPersistDeliveryCountBeforeDelivery(String user, Object source);
static void isPersistIDCache(Object source) {
BASE_LOGGER.isPersistIDCache(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601150, value = "User {0} is querying is-persist-id-cache on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isPersistIDCache(String user, Object source, Object... args);
+ @LogMessage(id = 601150, value = "User {} is querying is-persist-id-cache on target resource: {}", level = LogMessage.Level.INFO)
+ void isPersistIDCache(String user, Object source);
static void isWildcardRoutingEnabled(Object source) {
BASE_LOGGER.isWildcardRoutingEnabled(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601151, value = "User {0} is querying is-wildcard-routing-enabled on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isWildcardRoutingEnabled(String user, Object source, Object... args);
+ @LogMessage(id = 601151, value = "User {} is querying is-wildcard-routing-enabled on target resource: {}", level = LogMessage.Level.INFO)
+ void isWildcardRoutingEnabled(String user, Object source);
static void addUser(Object source, Object... args) {
- BASE_LOGGER.addUser(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.addUser(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601152, value = "User {0} is adding a user on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void addUser(String user, Object source, Object... args);
+ @LogMessage(id = 601152, value = "User {} is adding a user on target resource: {} {}", level = LogMessage.Level.INFO)
+ void addUser(String user, Object source, String args);
static void listUser(Object source, Object... args) {
- BASE_LOGGER.listUser(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listUser(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601153, value = "User {0} is listing a user on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listUser(String user, Object source, Object... args);
+ @LogMessage(id = 601153, value = "User {} is listing a user on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listUser(String user, Object source, String args);
static void removeUser(Object source, Object... args) {
- BASE_LOGGER.removeUser(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeUser(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601154, value = "User {0} is removing a user on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void removeUser(String user, Object source, Object... args);
+ @LogMessage(id = 601154, value = "User {} is removing a user on target resource: {} {}", level = LogMessage.Level.INFO)
+ void removeUser(String user, Object source, String args);
static void resetUser(Object source, Object... args) {
- BASE_LOGGER.resetUser(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.resetUser(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601155, value = "User {0} is resetting a user on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resetUser(String user, Object source, Object... args);
+ @LogMessage(id = 601155, value = "User {} is resetting a user on target resource: {} {}", level = LogMessage.Level.INFO)
+ void resetUser(String user, Object source, String args);
static void getUser(Object source) {
BASE_LOGGER.getUser(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601156, value = "User {0} is getting user property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getUser(String user, Object source, Object... args);
+ @LogMessage(id = 601156, value = "User {} is getting user property on target resource: {}", level = LogMessage.Level.INFO)
+ void getUser(String user, Object source);
static void getRoutingType(Object source) {
BASE_LOGGER.getRoutingType(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601157, value = "User {0} is getting routing type property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getRoutingType(String user, Object source, Object... args);
+ @LogMessage(id = 601157, value = "User {} is getting routing type property on target resource: {}", level = LogMessage.Level.INFO)
+ void getRoutingType(String user, Object source);
static void isTemporary(Object source) {
BASE_LOGGER.isTemporary(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601158, value = "User {0} is getting temporary property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isTemporary(String user, Object source, Object... args);
+ @LogMessage(id = 601158, value = "User {} is getting temporary property on target resource: {}", level = LogMessage.Level.INFO)
+ void isTemporary(String user, Object source);
static void getPersistentSize(Object source) {
BASE_LOGGER.getPersistentSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601159, value = "User {0} is getting persistent size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getPersistentSize(String user, Object source, Object... args);
+ @LogMessage(id = 601159, value = "User {} is getting persistent size on target resource: {}", level = LogMessage.Level.INFO)
+ void getPersistentSize(String user, Object source);
static void getDurableMessageCount(Object source) {
BASE_LOGGER.getDurableMessageCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601160, value = "User {0} is getting durable message count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDurableMessageCount(String user, Object source, Object... args);
+ @LogMessage(id = 601160, value = "User {} is getting durable message count on target resource: {}", level = LogMessage.Level.INFO)
+ void getDurableMessageCount(String user, Object source);
static void getDurablePersistSize(Object source) {
BASE_LOGGER.getDurablePersistSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601161, value = "User {0} is getting durable persist size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDurablePersistSize(String user, Object source, Object... args);
+ @LogMessage(id = 601161, value = "User {} is getting durable persist size on target resource: {}", level = LogMessage.Level.INFO)
+ void getDurablePersistSize(String user, Object source);
static void getConsumerCount(Object source) {
BASE_LOGGER.getConsumerCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601162, value = "User {0} is getting consumer count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getConsumerCount(String user, Object source, Object... args);
+ @LogMessage(id = 601162, value = "User {} is getting consumer count on target resource: {}", level = LogMessage.Level.INFO)
+ void getConsumerCount(String user, Object source);
static void getDeliveringCount(Object source) {
BASE_LOGGER.getDeliveringCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601163, value = "User {0} is getting delivering count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDeliveringCount(String user, Object source, Object... args);
+ @LogMessage(id = 601163, value = "User {} is getting delivering count on target resource: {}", level = LogMessage.Level.INFO)
+ void getDeliveringCount(String user, Object source);
static void getDeliveringSize(Object source) {
BASE_LOGGER.getDeliveringSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601164, value = "User {0} is getting delivering size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDeliveringSize(String user, Object source, Object... args);
+ @LogMessage(id = 601164, value = "User {} is getting delivering size on target resource: {}", level = LogMessage.Level.INFO)
+ void getDeliveringSize(String user, Object source);
static void getDurableDeliveringCount(Object source) {
BASE_LOGGER.getDurableDeliveringCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601165, value = "User {0} is getting durable delivering count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDurableDeliveringCount(String user, Object source, Object... args);
+ @LogMessage(id = 601165, value = "User {} is getting durable delivering count on target resource: {}", level = LogMessage.Level.INFO)
+ void getDurableDeliveringCount(String user, Object source);
static void getDurableDeliveringSize(Object source) {
BASE_LOGGER.getDurableDeliveringSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601166, value = "User {0} is getting durable delivering size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDurableDeliveringSize(String user, Object source, Object... args);
+ @LogMessage(id = 601166, value = "User {} is getting durable delivering size on target resource: {}", level = LogMessage.Level.INFO)
+ void getDurableDeliveringSize(String user, Object source);
static void getMessagesAdded(Object source) {
BASE_LOGGER.getMessagesAdded(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601167, value = "User {0} is getting messages added on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessagesAdded(String user, Object source, Object... args);
+ @LogMessage(id = 601167, value = "User {} is getting messages added on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessagesAdded(String user, Object source);
static void getMessagesAcknowledged(Object source) {
BASE_LOGGER.getMessagesAcknowledged(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601168, value = "User {0} is getting messages acknowledged on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessagesAcknowledged(String user, Object source, Object... args);
+ @LogMessage(id = 601168, value = "User {} is getting messages acknowledged on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessagesAcknowledged(String user, Object source);
static void getMessagesExpired(Object source) {
BASE_LOGGER.getMessagesExpired(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601169, value = "User {0} is getting messages expired on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessagesExpired(String user, Object source, Object... args);
+ @LogMessage(id = 601169, value = "User {} is getting messages expired on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessagesExpired(String user, Object source);
static void getMessagesKilled(Object source) {
BASE_LOGGER.getMessagesKilled(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601170, value = "User {0} is getting messages killed on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessagesKilled(String user, Object source, Object... args);
+ @LogMessage(id = 601170, value = "User {} is getting messages killed on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessagesKilled(String user, Object source);
static void getID(Object source) {
BASE_LOGGER.getID(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601171, value = "User {0} is getting ID on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getID(String user, Object source, Object... args);
+ @LogMessage(id = 601171, value = "User {} is getting ID on target resource: {}", level = LogMessage.Level.INFO)
+ void getID(String user, Object source);
static void getScheduledCount(Object source) {
BASE_LOGGER.getScheduledCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601172, value = "User {0} is getting scheduled count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getScheduledCount(String user, Object source, Object... args);
+ @LogMessage(id = 601172, value = "User {} is getting scheduled count on target resource: {}", level = LogMessage.Level.INFO)
+ void getScheduledCount(String user, Object source);
static void getScheduledSize(Object source) {
BASE_LOGGER.getScheduledSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601173, value = "User {0} is getting scheduled size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getScheduledSize(String user, Object source, Object... args);
+ @LogMessage(id = 601173, value = "User {} is getting scheduled size on target resource: {}", level = LogMessage.Level.INFO)
+ void getScheduledSize(String user, Object source);
static void getDurableScheduledCount(Object source) {
BASE_LOGGER.getDurableScheduledCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601174, value = "User {0} is getting durable scheduled count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDurableScheduledCount(String user, Object source, Object... args);
+ @LogMessage(id = 601174, value = "User {} is getting durable scheduled count on target resource: {}", level = LogMessage.Level.INFO)
+ void getDurableScheduledCount(String user, Object source);
static void getDurableScheduledSize(Object source) {
BASE_LOGGER.getDurableScheduledSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601175, value = "User {0} is getting durable scheduled size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDurableScheduledSize(String user, Object source, Object... args);
+ @LogMessage(id = 601175, value = "User {} is getting durable scheduled size on target resource: {}", level = LogMessage.Level.INFO)
+ void getDurableScheduledSize(String user, Object source);
static void getDeadLetterAddress(Object source) {
BASE_LOGGER.getDeadLetterAddress(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601176, value = "User {0} is getting dead letter address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDeadLetterAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601176, value = "User {} is getting dead letter address on target resource: {}", level = LogMessage.Level.INFO)
+ void getDeadLetterAddress(String user, Object source);
static void getExpiryAddress(Object source) {
BASE_LOGGER.getExpiryAddress(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601177, value = "User {0} is getting expiry address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getExpiryAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601177, value = "User {} is getting expiry address on target resource: {}", level = LogMessage.Level.INFO)
+ void getExpiryAddress(String user, Object source);
static void getMaxConsumers(Object source) {
BASE_LOGGER.getMaxConsumers(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601178, value = "User {0} is getting max consumers on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMaxConsumers(String user, Object source, Object... args);
+ @LogMessage(id = 601178, value = "User {} is getting max consumers on target resource: {}", level = LogMessage.Level.INFO)
+ void getMaxConsumers(String user, Object source);
static void isPurgeOnNoConsumers(Object source) {
BASE_LOGGER.isPurgeOnNoConsumers(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601179, value = "User {0} is getting purge-on-consumers property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isPurgeOnNoConsumers(String user, Object source, Object... args);
+ @LogMessage(id = 601179, value = "User {} is getting purge-on-consumers property on target resource: {}", level = LogMessage.Level.INFO)
+ void isPurgeOnNoConsumers(String user, Object source);
static void isConfigurationManaged(Object source) {
BASE_LOGGER.isConfigurationManaged(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601180, value = "User {0} is getting configuration-managed property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isConfigurationManaged(String user, Object source, Object... args);
+ @LogMessage(id = 601180, value = "User {} is getting configuration-managed property on target resource: {}", level = LogMessage.Level.INFO)
+ void isConfigurationManaged(String user, Object source);
static void isExclusive(Object source) {
BASE_LOGGER.isExclusive(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601181, value = "User {0} is getting exclusive property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isExclusive(String user, Object source, Object... args);
+ @LogMessage(id = 601181, value = "User {} is getting exclusive property on target resource: {}", level = LogMessage.Level.INFO)
+ void isExclusive(String user, Object source);
static void isLastValue(Object source) {
BASE_LOGGER.isLastValue(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601182, value = "User {0} is getting last-value property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isLastValue(String user, Object source, Object... args);
+ @LogMessage(id = 601182, value = "User {} is getting last-value property on target resource: {}", level = LogMessage.Level.INFO)
+ void isLastValue(String user, Object source);
static void listScheduledMessages(Object source) {
BASE_LOGGER.listScheduledMessages(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601183, value = "User {0} is listing scheduled messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listScheduledMessages(String user, Object source, Object... args);
+ @LogMessage(id = 601183, value = "User {} is listing scheduled messages on target resource: {}", level = LogMessage.Level.INFO)
+ void listScheduledMessages(String user, Object source);
static void listScheduledMessagesAsJSON(Object source) {
BASE_LOGGER.listScheduledMessagesAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601184, value = "User {0} is listing scheduled messages as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listScheduledMessagesAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601184, value = "User {} is listing scheduled messages as json on target resource: {}", level = LogMessage.Level.INFO)
+ void listScheduledMessagesAsJSON(String user, Object source);
static void listDeliveringMessages(Object source) {
BASE_LOGGER.listDeliveringMessages(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601185, value = "User {0} is listing delivering messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listDeliveringMessages(String user, Object source, Object... args);
+ @LogMessage(id = 601185, value = "User {} is listing delivering messages on target resource: {}", level = LogMessage.Level.INFO)
+ void listDeliveringMessages(String user, Object source);
static void listDeliveringMessagesAsJSON(Object source) {
BASE_LOGGER.listDeliveringMessagesAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601186, value = "User {0} is listing delivering messages as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listDeliveringMessagesAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601186, value = "User {} is listing delivering messages as json on target resource: {}", level = LogMessage.Level.INFO)
+ void listDeliveringMessagesAsJSON(String user, Object source);
static void listMessages(Object source, Object... args) {
- BASE_LOGGER.listMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.listMessages(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601187, value = "User {0} is listing messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listMessages(String user, Object source, Object... args);
+ @LogMessage(id = 601187, value = "User {} is listing messages on target resource: {} {}", level = LogMessage.Level.INFO)
+ void listMessages(String user, Object source, String args);
static void listMessagesAsJSON(Object source) {
BASE_LOGGER.listMessagesAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601188, value = "User {0} is listing messages as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listMessagesAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601188, value = "User {} is listing messages as json on target resource: {}", level = LogMessage.Level.INFO)
+ void listMessagesAsJSON(String user, Object source);
static void getFirstMessage(Object source) {
BASE_LOGGER.getFirstMessage(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601189, value = "User {0} is getting first message on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getFirstMessage(String user, Object source, Object... args);
+ @LogMessage(id = 601189, value = "User {} is getting first message on target resource: {}", level = LogMessage.Level.INFO)
+ void getFirstMessage(String user, Object source);
static void getFirstMessageAsJSON(Object source) {
BASE_LOGGER.getFirstMessageAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601190, value = "User {0} is getting first message as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getFirstMessageAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601190, value = "User {} is getting first message as json on target resource: {}", level = LogMessage.Level.INFO)
+ void getFirstMessageAsJSON(String user, Object source);
static void getFirstMessageTimestamp(Object source) {
BASE_LOGGER.getFirstMessageTimestamp(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601191, value = "User {0} is getting first message's timestamp on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getFirstMessageTimestamp(String user, Object source, Object... args);
+ @LogMessage(id = 601191, value = "User {} is getting first message's timestamp on target resource: {}", level = LogMessage.Level.INFO)
+ void getFirstMessageTimestamp(String user, Object source);
static void getFirstMessageAge(Object source) {
BASE_LOGGER.getFirstMessageAge(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601192, value = "User {0} is getting first message's age on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getFirstMessageAge(String user, Object source, Object... args);
+ @LogMessage(id = 601192, value = "User {} is getting first message's age on target resource: {}", level = LogMessage.Level.INFO)
+ void getFirstMessageAge(String user, Object source);
static void countMessages(Object source, Object... args) {
- BASE_LOGGER.countMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.countMessages(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601193, value = "User {0} is counting messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void countMessages(String user, Object source, Object... args);
+ @LogMessage(id = 601193, value = "User {} is counting messages on target resource: {} {}", level = LogMessage.Level.INFO)
+ void countMessages(String user, Object source, String args);
static void countDeliveringMessages(Object source, Object... args) {
- BASE_LOGGER.countDeliveringMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.countDeliveringMessages(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601194, value = "User {0} is counting delivery messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void countDeliveringMessages(String user, Object source, Object... args);
+ @LogMessage(id = 601194, value = "User {} is counting delivery messages on target resource: {} {}", level = LogMessage.Level.INFO)
+ void countDeliveringMessages(String user, Object source, String args);
static void removeMessage(Object source, Object... args) {
- BASE_LOGGER.removeMessage(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeMessage(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601195, value = "User {0} is removing a message on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void removeMessage(String user, Object source, Object... args);
+ @LogMessage(id = 601195, value = "User {} is removing a message on target resource: {} {}", level = LogMessage.Level.INFO)
+ void removeMessage(String user, Object source, String args);
static void removeMessages(Object source, Object... args) {
- BASE_LOGGER.removeMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.removeMessages(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601196, value = "User {0} is removing messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void removeMessages(String user, Object source, Object... args);
+ @LogMessage(id = 601196, value = "User {} is removing messages on target resource: {} {}", level = LogMessage.Level.INFO)
+ void removeMessages(String user, Object source, String args);
static void expireMessage(Object source, Object... args) {
- BASE_LOGGER.expireMessage(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.expireMessage(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601197, value = "User {0} is expiring messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void expireMessage(String user, Object source, Object... args);
+ @LogMessage(id = 601197, value = "User {} is expiring messages on target resource: {} {}", level = LogMessage.Level.INFO)
+ void expireMessage(String user, Object source, String args);
static void expireMessages(Object source, Object... args) {
- BASE_LOGGER.expireMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.expireMessages(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601198, value = "User {0} is expiring messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void expireMessages(String user, Object source, Object... args);
+ @LogMessage(id = 601198, value = "User {} is expiring messages on target resource: {} {}", level = LogMessage.Level.INFO)
+ void expireMessages(String user, Object source, String args);
static void retryMessage(Object source, Object... args) {
- BASE_LOGGER.retryMessage(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.retryMessage(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601199, value = "User {0} is retry sending message on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void retryMessage(String user, Object source, Object... args);
+ @LogMessage(id = 601199, value = "User {} is retry sending message on target resource: {} {}", level = LogMessage.Level.INFO)
+ void retryMessage(String user, Object source, String args);
static void retryMessages(Object source) {
BASE_LOGGER.retryMessages(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601200, value = "User {0} is retry sending messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void retryMessages(String user, Object source, Object... args);
+ @LogMessage(id = 601200, value = "User {} is retry sending messages on target resource: {}", level = LogMessage.Level.INFO)
+ void retryMessages(String user, Object source);
static void moveMessage(Object source, Object... args) {
- BASE_LOGGER.moveMessage(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.moveMessage(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601201, value = "User {0} is moving a message to another queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void moveMessage(String user, Object source, Object... args);
+ @LogMessage(id = 601201, value = "User {} is moving a message to another queue on target resource: {} {}", level = LogMessage.Level.INFO)
+ void moveMessage(String user, Object source, String args);
static void moveMessages(Object source, Object... args) {
- BASE_LOGGER.moveMessages(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.moveMessages(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601202, value = "User {0} is moving messages to another queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void moveMessages(String user, Object source, Object... args);
+ @LogMessage(id = 601202, value = "User {} is moving messages to another queue on target resource: {} {}", level = LogMessage.Level.INFO)
+ void moveMessages(String user, Object source, String args);
static void sendMessagesToDeadLetterAddress(Object source, Object... args) {
- BASE_LOGGER.sendMessagesToDeadLetterAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.sendMessagesToDeadLetterAddress(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601203, value = "User {0} is sending messages to dead letter address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void sendMessagesToDeadLetterAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601203, value = "User {} is sending messages to dead letter address on target resource: {} {}", level = LogMessage.Level.INFO)
+ void sendMessagesToDeadLetterAddress(String user, Object source, String args);
static void sendMessageToDeadLetterAddress(Object source, Object... args) {
- BASE_LOGGER.sendMessageToDeadLetterAddress(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.sendMessageToDeadLetterAddress(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601204, value = "User {0} is sending messages to dead letter address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void sendMessageToDeadLetterAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601204, value = "User {} is sending messages to dead letter address on target resource: {} {}", level = LogMessage.Level.INFO)
+ void sendMessageToDeadLetterAddress(String user, Object source, String args);
static void changeMessagesPriority(Object source, Object... args) {
- BASE_LOGGER.changeMessagesPriority(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.changeMessagesPriority(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601205, value = "User {0} is changing message's priority on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void changeMessagesPriority(String user, Object source, Object... args);
+ @LogMessage(id = 601205, value = "User {} is changing message's priority on target resource: {} {}", level = LogMessage.Level.INFO)
+ void changeMessagesPriority(String user, Object source, String args);
static void changeMessagePriority(Object source, Object... args) {
- BASE_LOGGER.changeMessagePriority(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.changeMessagePriority(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601206, value = "User {0} is changing a message's priority on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void changeMessagePriority(String user, Object source, Object... args);
+ @LogMessage(id = 601206, value = "User {} is changing a message's priority on target resource: {} {}", level = LogMessage.Level.INFO)
+ void changeMessagePriority(String user, Object source, String args);
static void listMessageCounter(Object source) {
BASE_LOGGER.listMessageCounter(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601207, value = "User {0} is listing message counter on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listMessageCounter(String user, Object source, Object... args);
+ @LogMessage(id = 601207, value = "User {} is listing message counter on target resource: {}", level = LogMessage.Level.INFO)
+ void listMessageCounter(String user, Object source);
static void resetMessageCounter(Object source) {
BASE_LOGGER.resetMessageCounter(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601208, value = "User {0} is resetting message counter on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resetMessageCounter(String user, Object source, Object... args);
+ @LogMessage(id = 601208, value = "User {} is resetting message counter on target resource: {}", level = LogMessage.Level.INFO)
+ void resetMessageCounter(String user, Object source);
static void listMessageCounterAsHTML(Object source) {
BASE_LOGGER.listMessageCounterAsHTML(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601209, value = "User {0} is listing message counter as HTML on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listMessageCounterAsHTML(String user, Object source, Object... args);
+ @LogMessage(id = 601209, value = "User {} is listing message counter as HTML on target resource: {}", level = LogMessage.Level.INFO)
+ void listMessageCounterAsHTML(String user, Object source);
static void listMessageCounterHistory(Object source) {
BASE_LOGGER.listMessageCounterHistory(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601210, value = "User {0} is listing message counter history on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listMessageCounterHistory(String user, Object source, Object... args);
+ @LogMessage(id = 601210, value = "User {} is listing message counter history on target resource: {}", level = LogMessage.Level.INFO)
+ void listMessageCounterHistory(String user, Object source);
static void listMessageCounterHistoryAsHTML(Object source) {
BASE_LOGGER.listMessageCounterHistoryAsHTML(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601211, value = "User {0} is listing message counter history as HTML on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listMessageCounterHistoryAsHTML(String user, Object source, Object... args);
+ @LogMessage(id = 601211, value = "User {} is listing message counter history as HTML on target resource: {}", level = LogMessage.Level.INFO)
+ void listMessageCounterHistoryAsHTML(String user, Object source);
static void pause(Object source, Object... args) {
- BASE_LOGGER.pause(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.pause(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601212, value = "User {0} is pausing on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void pause(String user, Object source, Object... args);
+ @LogMessage(id = 601212, value = "User {} is pausing on target resource: {} {}", level = LogMessage.Level.INFO)
+ void pause(String user, Object source, String args);
static void resume(Object source) {
BASE_LOGGER.resume(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601213, value = "User {0} is resuming on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resume(String user, Object source, Object... args);
+ @LogMessage(id = 601213, value = "User {} is resuming on target resource: {}", level = LogMessage.Level.INFO)
+ void resume(String user, Object source);
static void isPaused(Object source) {
BASE_LOGGER.isPaused(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601214, value = "User {0} is getting paused property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isPaused(String user, Object source, Object... args);
+ @LogMessage(id = 601214, value = "User {} is getting paused property on target resource: {}", level = LogMessage.Level.INFO)
+ void isPaused(String user, Object source);
static void browse(Object source, Object... args) {
- BASE_LOGGER.browse(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.browse(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601215, value = "User {0} is browsing a queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void browse(String user, Object source, Object... args);
+ @LogMessage(id = 601215, value = "User {} is browsing a queue on target resource: {} {}", level = LogMessage.Level.INFO)
+ void browse(String user, Object source, String args);
static void flushExecutor(Object source) {
BASE_LOGGER.flushExecutor(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601216, value = "User {0} is flushing executor on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void flushExecutor(String user, Object source, Object... args);
+ @LogMessage(id = 601216, value = "User {} is flushing executor on target resource: {}", level = LogMessage.Level.INFO)
+ void flushExecutor(String user, Object source);
static void resetAllGroups(Object source) {
BASE_LOGGER.resetAllGroups(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601217, value = "User {0} is resetting all groups on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resetAllGroups(String user, Object source, Object... args);
+ @LogMessage(id = 601217, value = "User {} is resetting all groups on target resource: {}", level = LogMessage.Level.INFO)
+ void resetAllGroups(String user, Object source);
static void resetGroup(Object source, Object... args) {
- BASE_LOGGER.resetGroup(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.resetGroup(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601218, value = "User {0} is resetting group on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resetGroup(String user, Object source, Object... args);
+ @LogMessage(id = 601218, value = "User {} is resetting group on target resource: {} {}", level = LogMessage.Level.INFO)
+ void resetGroup(String user, Object source, String arg);
static void getGroupCount(Object source, Object... args) {
- BASE_LOGGER.getGroupCount(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getGroupCount(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601219, value = "User {0} is getting group count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getGroupCount(String user, Object source, Object... args);
+ @LogMessage(id = 601219, value = "User {} is getting group count on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getGroupCount(String user, Object source, String args);
static void listGroupsAsJSON(Object source) {
BASE_LOGGER.listGroupsAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601220, value = "User {0} is listing groups as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void listGroupsAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601220, value = "User {} is listing groups as json on target resource: {}", level = LogMessage.Level.INFO)
+ void listGroupsAsJSON(String user, Object source);
static void resetMessagesAdded(Object source) {
BASE_LOGGER.resetMessagesAdded(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601221, value = "User {0} is resetting added messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resetMessagesAdded(String user, Object source, Object... args);
+ @LogMessage(id = 601221, value = "User {} is resetting added messages on target resource: {}", level = LogMessage.Level.INFO)
+ void resetMessagesAdded(String user, Object source);
static void resetMessagesAcknowledged(Object source) {
BASE_LOGGER.resetMessagesAcknowledged(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601222, value = "User {0} is resetting acknowledged messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resetMessagesAcknowledged(String user, Object source, Object... args);
+ @LogMessage(id = 601222, value = "User {} is resetting acknowledged messages on target resource: {}", level = LogMessage.Level.INFO)
+ void resetMessagesAcknowledged(String user, Object source);
static void resetMessagesExpired(Object source) {
BASE_LOGGER.resetMessagesExpired(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601223, value = "User {0} is resetting expired messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resetMessagesExpired(String user, Object source, Object... args);
+ @LogMessage(id = 601223, value = "User {} is resetting expired messages on target resource: {}", level = LogMessage.Level.INFO)
+ void resetMessagesExpired(String user, Object source);
static void resetMessagesKilled(Object source) {
BASE_LOGGER.resetMessagesKilled(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601224, value = "User {0} is resetting killed messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void resetMessagesKilled(String user, Object source, Object... args);
+ @LogMessage(id = 601224, value = "User {} is resetting killed messages on target resource: {}", level = LogMessage.Level.INFO)
+ void resetMessagesKilled(String user, Object source);
static void getStaticConnectors(Object source) {
BASE_LOGGER.getStaticConnectors(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601225, value = "User {0} is getting static connectors on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getStaticConnectors(String user, Object source, Object... args);
+ @LogMessage(id = 601225, value = "User {} is getting static connectors on target resource: {}", level = LogMessage.Level.INFO)
+ void getStaticConnectors(String user, Object source);
static void getForwardingAddress(Object source) {
BASE_LOGGER.getForwardingAddress(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601226, value = "User {0} is getting forwarding address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getForwardingAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601226, value = "User {} is getting forwarding address on target resource: {}", level = LogMessage.Level.INFO)
+ void getForwardingAddress(String user, Object source);
static void getQueueName(Object source) {
BASE_LOGGER.getQueueName(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601227, value = "User {0} is getting the queue name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getQueueName(String user, Object source, Object... args);
+ @LogMessage(id = 601227, value = "User {} is getting the queue name on target resource: {}", level = LogMessage.Level.INFO)
+ void getQueueName(String user, Object source);
static void getDiscoveryGroupName(Object source) {
BASE_LOGGER.getDiscoveryGroupName(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601228, value = "User {0} is getting discovery group name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDiscoveryGroupName(String user, Object source, Object... args);
+ @LogMessage(id = 601228, value = "User {} is getting discovery group name on target resource: {}", level = LogMessage.Level.INFO)
+ void getDiscoveryGroupName(String user, Object source);
static void getFilterString(Object source) {
BASE_LOGGER.getFilterString(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601229, value = "User {0} is getting filter string on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getFilterString(String user, Object source, Object... args);
+ @LogMessage(id = 601229, value = "User {} is getting filter string on target resource: {}", level = LogMessage.Level.INFO)
+ void getFilterString(String user, Object source);
static void getReconnectAttempts(Object source) {
BASE_LOGGER.getReconnectAttempts(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601230, value = "User {0} is getting reconnect attempts on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getReconnectAttempts(String user, Object source, Object... args);
+ @LogMessage(id = 601230, value = "User {} is getting reconnect attempts on target resource: {}", level = LogMessage.Level.INFO)
+ void getReconnectAttempts(String user, Object source);
static void getRetryInterval(Object source) {
BASE_LOGGER.getRetryInterval(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601231, value = "User {0} is getting retry interval on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getRetryInterval(String user, Object source, Object... args);
+ @LogMessage(id = 601231, value = "User {} is getting retry interval on target resource: {}", level = LogMessage.Level.INFO)
+ void getRetryInterval(String user, Object source);
static void getRetryIntervalMultiplier(Object source) {
BASE_LOGGER.getRetryIntervalMultiplier(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601232, value = "User {0} is getting retry interval multiplier on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getRetryIntervalMultiplier(String user, Object source, Object... args);
+ @LogMessage(id = 601232, value = "User {} is getting retry interval multiplier on target resource: {}", level = LogMessage.Level.INFO)
+ void getRetryIntervalMultiplier(String user, Object source);
static void getTransformerClassName(Object source) {
BASE_LOGGER.getTransformerClassName(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601233, value = "User {0} is getting transformer class name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTransformerClassName(String user, Object source, Object... args);
+ @LogMessage(id = 601233, value = "User {} is getting transformer class name on target resource: {}", level = LogMessage.Level.INFO)
+ void getTransformerClassName(String user, Object source);
static void getTransformerPropertiesAsJSON(Object source) {
BASE_LOGGER.getTransformerPropertiesAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601234, value = "User {0} is getting transformer properties as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTransformerPropertiesAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601234, value = "User {} is getting transformer properties as json on target resource: {}", level = LogMessage.Level.INFO)
+ void getTransformerPropertiesAsJSON(String user, Object source);
static void getTransformerProperties(Object source) {
BASE_LOGGER.getTransformerProperties(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601235, value = "User {0} is getting transformer properties on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTransformerProperties(String user, Object source, Object... args);
+ @LogMessage(id = 601235, value = "User {} is getting transformer properties on target resource: {}", level = LogMessage.Level.INFO)
+ void getTransformerProperties(String user, Object source);
static void isStartedBridge(Object source) {
BASE_LOGGER.isStartedBridge(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601236, value = "User {0} is checking if bridge started on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isStartedBridge(String user, Object source, Object... args);
+ @LogMessage(id = 601236, value = "User {} is checking if bridge started on target resource: {}", level = LogMessage.Level.INFO)
+ void isStartedBridge(String user, Object source);
static void isUseDuplicateDetection(Object source) {
BASE_LOGGER.isUseDuplicateDetection(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601237, value = "User {0} is querying use duplicate detection on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isUseDuplicateDetection(String user, Object source, Object... args);
+ @LogMessage(id = 601237, value = "User {} is querying use duplicate detection on target resource: {}", level = LogMessage.Level.INFO)
+ void isUseDuplicateDetection(String user, Object source);
static void isHA(Object source) {
BASE_LOGGER.isHA(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601238, value = "User {0} is querying isHA on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isHA(String user, Object source, Object... args);
+ @LogMessage(id = 601238, value = "User {} is querying isHA on target resource: {}", level = LogMessage.Level.INFO)
+ void isHA(String user, Object source);
static void startBridge(Object source) {
BASE_LOGGER.startBridge(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601239, value = "User {0} is starting a bridge on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void startBridge(String user, Object source, Object... args);
+ @LogMessage(id = 601239, value = "User {} is starting a bridge on target resource: {}", level = LogMessage.Level.INFO)
+ void startBridge(String user, Object source);
static void stopBridge(Object source) {
BASE_LOGGER.stopBridge(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601240, value = "User {0} is stopping a bridge on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void stopBridge(String user, Object source, Object... args);
+ @LogMessage(id = 601240, value = "User {} is stopping a bridge on target resource: {}", level = LogMessage.Level.INFO)
+ void stopBridge(String user, Object source);
static void getMessagesPendingAcknowledgement(Object source) {
BASE_LOGGER.getMessagesPendingAcknowledgement(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601241, value = "User {0} is getting messages pending acknowledgement on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessagesPendingAcknowledgement(String user, Object source, Object... args);
+ @LogMessage(id = 601241, value = "User {} is getting messages pending acknowledgement on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessagesPendingAcknowledgement(String user, Object source);
static void getMetrics(Object source) {
BASE_LOGGER.getMetrics(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601242, value = "User {0} is getting metrics on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMetrics(String user, Object source, Object... args);
+ @LogMessage(id = 601242, value = "User {} is getting metrics on target resource: {}", level = LogMessage.Level.INFO)
+ void getMetrics(String user, Object source);
static void getBroadcastPeriod(Object source) {
BASE_LOGGER.getBroadcastPeriod(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601243, value = "User {0} is getting broadcast period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getBroadcastPeriod(String user, Object source, Object... args);
+ @LogMessage(id = 601243, value = "User {} is getting broadcast period on target resource: {}", level = LogMessage.Level.INFO)
+ void getBroadcastPeriod(String user, Object source);
static void getConnectorPairs(Object source) {
BASE_LOGGER.getConnectorPairs(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601244, value = "User {0} is getting connector pairs on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getConnectorPairs(String user, Object source, Object... args);
+ @LogMessage(id = 601244, value = "User {} is getting connector pairs on target resource: {}", level = LogMessage.Level.INFO)
+ void getConnectorPairs(String user, Object source);
static void getConnectorPairsAsJSON(Object source) {
BASE_LOGGER.getConnectorPairsAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601245, value = "User {0} is getting connector pairs as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getConnectorPairsAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601245, value = "User {} is getting connector pairs as json on target resource: {}", level = LogMessage.Level.INFO)
+ void getConnectorPairsAsJSON(String user, Object source);
static void getGroupAddress(Object source) {
BASE_LOGGER.getGroupAddress(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601246, value = "User {0} is getting group address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getGroupAddress(String user, Object source, Object... args);
+ @LogMessage(id = 601246, value = "User {} is getting group address on target resource: {}", level = LogMessage.Level.INFO)
+ void getGroupAddress(String user, Object source);
static void getGroupPort(Object source) {
BASE_LOGGER.getGroupPort(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601247, value = "User {0} is getting group port on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getGroupPort(String user, Object source, Object... args);
+ @LogMessage(id = 601247, value = "User {} is getting group port on target resource: {}", level = LogMessage.Level.INFO)
+ void getGroupPort(String user, Object source);
static void getLocalBindPort(Object source) {
BASE_LOGGER.getLocalBindPort(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601248, value = "User {0} is getting local binding port on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getLocalBindPort(String user, Object source, Object... args);
+ @LogMessage(id = 601248, value = "User {} is getting local binding port on target resource: {}", level = LogMessage.Level.INFO)
+ void getLocalBindPort(String user, Object source);
static void startBroadcastGroup(Object source) {
BASE_LOGGER.startBroadcastGroup(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601249, value = "User {0} is starting broadcasting group on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void startBroadcastGroup(String user, Object source, Object... args);
+ @LogMessage(id = 601249, value = "User {} is starting broadcasting group on target resource: {}", level = LogMessage.Level.INFO)
+ void startBroadcastGroup(String user, Object source);
static void stopBroadcastGroup(Object source) {
BASE_LOGGER.stopBroadcastGroup(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601250, value = "User {0} is stopping broadcasting group on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void stopBroadcastGroup(String user, Object source, Object... args);
+ @LogMessage(id = 601250, value = "User {} is stopping broadcasting group on target resource: {}", level = LogMessage.Level.INFO)
+ void stopBroadcastGroup(String user, Object source);
static void getMaxHops(Object source) {
BASE_LOGGER.getMaxHops(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601251, value = "User {0} is getting max hops on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMaxHops(String user, Object source, Object... args);
+ @LogMessage(id = 601251, value = "User {} is getting max hops on target resource: {}", level = LogMessage.Level.INFO)
+ void getMaxHops(String user, Object source);
static void getStaticConnectorsAsJSON(Object source) {
BASE_LOGGER.getStaticConnectorsAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601252, value = "User {0} is geting static connectors as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getStaticConnectorsAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601252, value = "User {} is geting static connectors as json on target resource: {}", level = LogMessage.Level.INFO)
+ void getStaticConnectorsAsJSON(String user, Object source);
static void isDuplicateDetection(Object source) {
BASE_LOGGER.isDuplicateDetection(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601253, value = "User {0} is querying use duplicate detection on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isDuplicateDetection(String user, Object source, Object... args);
+ @LogMessage(id = 601253, value = "User {} is querying use duplicate detection on target resource: {}", level = LogMessage.Level.INFO)
+ void isDuplicateDetection(String user, Object source);
static void getMessageLoadBalancingType(Object source) {
BASE_LOGGER.getMessageLoadBalancingType(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601254, value = "User {0} is getting message loadbalancing type on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMessageLoadBalancingType(String user, Object source, Object... args);
+ @LogMessage(id = 601254, value = "User {} is getting message loadbalancing type on target resource: {}", level = LogMessage.Level.INFO)
+ void getMessageLoadBalancingType(String user, Object source);
static void getTopology(Object source) {
BASE_LOGGER.getTopology(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601255, value = "User {0} is getting topology on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getTopology(String user, Object source, Object... args);
+ @LogMessage(id = 601255, value = "User {} is getting topology on target resource: {}", level = LogMessage.Level.INFO)
+ void getTopology(String user, Object source);
static void getNodes(Object source) {
BASE_LOGGER.getNodes(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601256, value = "User {0} is getting nodes on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getNodes(String user, Object source, Object... args);
+ @LogMessage(id = 601256, value = "User {} is getting nodes on target resource: {}", level = LogMessage.Level.INFO)
+ void getNodes(String user, Object source);
static void startClusterConnection(Object source) {
BASE_LOGGER.startClusterConnection(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601257, value = "User {0} is start cluster connection on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void startClusterConnection(String user, Object source, Object... args);
+ @LogMessage(id = 601257, value = "User {} is start cluster connection on target resource: {}", level = LogMessage.Level.INFO)
+ void startClusterConnection(String user, Object source);
static void stopClusterConnection(Object source) {
BASE_LOGGER.stopClusterConnection(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601258, value = "User {0} is stop cluster connection on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void stopClusterConnection(String user, Object source, Object... args);
+ @LogMessage(id = 601258, value = "User {} is stop cluster connection on target resource: {}", level = LogMessage.Level.INFO)
+ void stopClusterConnection(String user, Object source);
static void getBridgeMetrics(Object source, Object... args) {
- BASE_LOGGER.getBridgeMetrics(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getBridgeMetrics(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601259, value = "User {0} is getting bridge metrics on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getBridgeMetrics(String user, Object source, Object... args);
+ @LogMessage(id = 601259, value = "User {} is getting bridge metrics on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getBridgeMetrics(String user, Object source, String args);
static void getRoutingName(Object source) {
BASE_LOGGER.getRoutingName(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601260, value = "User {0} is getting routing name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getRoutingName(String user, Object source, Object... args);
+ @LogMessage(id = 601260, value = "User {} is getting routing name on target resource: {}", level = LogMessage.Level.INFO)
+ void getRoutingName(String user, Object source);
static void getUniqueName(Object 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);
+ @LogMessage(id = 601261, value = "User {} is getting unique name on target resource: {}", level = LogMessage.Level.INFO)
+ void getUniqueName(String user, Object source);
static void serverSessionCreateAddress(Object source, Subject user, String remoteAddress, Object... args) {
- BASE_LOGGER.serverSessionCreateAddress2(getCaller(user, remoteAddress), source, arrayToString(args));
+ BASE_LOGGER.serverSessionCreateAddress2(getCaller(user, remoteAddress), source, parametersList(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);
+ @LogMessage(id = 601262, value = "User {} is creating address on target resource: {} {}", level = LogMessage.Level.INFO)
+ void serverSessionCreateAddress2(String user, Object source, String args);
static void handleManagementMessage(Object source, Subject user, String remoteAddress, Object... args) {
- BASE_LOGGER.handleManagementMessage2(getCaller(user, remoteAddress), source, arrayToString(args));
+ BASE_LOGGER.handleManagementMessage2(getCaller(user, remoteAddress), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601263, value = "User {0} is handling a management message on target resource {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void handleManagementMessage2(String user, Object source, Object... args);
+ @LogMessage(id = 601263, value = "User {} is handling a management message on target resource {} {}", level = LogMessage.Level.INFO)
+ void handleManagementMessage2(String user, Object source, String args);
static void securityFailure(Exception cause) {
BASE_LOGGER.securityFailure(getCaller(), cause);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601264, value = "User {0} gets security check failure", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601264, value = "User {} gets security check failure", level = LogMessage.Level.INFO)
void securityFailure(String user, @Cause Throwable cause);
static void createCoreConsumer(Object source, Subject user, String remoteAddress, Object... args) {
- BASE_LOGGER.createCoreConsumer(getCaller(user, remoteAddress), source, arrayToString(args));
+ BASE_LOGGER.createCoreConsumer(getCaller(user, remoteAddress), source, parametersList(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);
+ @LogMessage(id = 601265, value = "User {} is creating a core consumer on target resource {} {}", level = LogMessage.Level.INFO)
+ void createCoreConsumer(String user, Object source, String args);
static void createSharedQueue(Object source, Subject user, String remoteAddress, Object... args) {
- BASE_LOGGER.createSharedQueue(getCaller(user, remoteAddress), source, arrayToString(args));
+ BASE_LOGGER.createSharedQueue(getCaller(user, remoteAddress), source, parametersList(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);
+ @LogMessage(id = 601266, value = "User {} is creating a shared queue on target resource {} {}", level = LogMessage.Level.INFO)
+ void createSharedQueue(String user, Object source, String args);
static void createCoreSession(Object source, Subject user, String remoteAddress, Object... args) {
- BASE_LOGGER.createCoreSession(getCaller(user, remoteAddress), source, arrayToString(args));
+ BASE_LOGGER.createCoreSession(getCaller(user, remoteAddress), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601267, value = "User {0} is creating a core session on target resource {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void createCoreSession(String user, Object source, Object... args);
+ @LogMessage(id = 601267, value = "User {} is creating a core session on target resource {} {}", level = LogMessage.Level.INFO)
+ void createCoreSession(String user, Object source, String args);
static void getAcknowledgeAttempts(Object source) {
BASE_LOGGER.getMessagesAcknowledged(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601269, value = "User {0} is getting messages acknowledged attempts on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAcknowledgeAttempts(String user, Object source, Object... args);
+ @LogMessage(id = 601269, value = "User {} is getting messages acknowledged attempts on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getAcknowledgeAttempts(String user, Object source, String args);
static void getRingSize(Object source, Object... args) {
- BASE_LOGGER.getRingSize(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.getRingSize(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601270, value = "User {0} is getting ring size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getRingSize(String user, Object source, Object... args);
+ @LogMessage(id = 601270, value = "User {} is getting ring size on target resource: {} {}", level = LogMessage.Level.INFO)
+ void getRingSize(String user, Object source, String args);
static void isRetroactiveResource(Object source) {
BASE_LOGGER.isRetroactiveResource(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601271, value = "User {0} is getting retroactiveResource property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isRetroactiveResource(String user, Object source, Object... args);
+ @LogMessage(id = 601271, value = "User {} is getting retroactiveResource property on target resource: {}", level = LogMessage.Level.INFO)
+ void isRetroactiveResource(String user, Object source);
static void getDiskStoreUsage(Object source) {
BASE_LOGGER.getDiskStoreUsage(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601272, value = "User {0} is getting disk store usage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDiskStoreUsage(String user, Object source, Object... args);
+ @LogMessage(id = 601272, value = "User {} is getting disk store usage on target resource: {}", level = LogMessage.Level.INFO)
+ void getDiskStoreUsage(String user, Object source);
static void getDiskStoreUsagePercentage(Object source) {
BASE_LOGGER.getDiskStoreUsagePercentage(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601273, value = "User {0} is getting disk store usage percentage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getDiskStoreUsagePercentage(String user, Object source, Object... args);
+ @LogMessage(id = 601273, value = "User {} is getting disk store usage percentage on target resource: {}", level = LogMessage.Level.INFO)
+ void getDiskStoreUsagePercentage(String user, Object source);
static void isGroupRebalance(Object source) {
BASE_LOGGER.isGroupRebalance(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601274, value = "User {0} is getting group rebalance property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isGroupRebalance(String user, Object source, Object... args);
+ @LogMessage(id = 601274, value = "User {} is getting group rebalance property on target resource: {}", level = LogMessage.Level.INFO)
+ void isGroupRebalance(String user, Object source);
static void getGroupBuckets(Object source) {
BASE_LOGGER.getGroupBuckets(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601275, value = "User {0} is getting group buckets on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getGroupBuckets(String user, Object source, Object... args);
+ @LogMessage(id = 601275, value = "User {} is getting group buckets on target resource: {}", level = LogMessage.Level.INFO)
+ void getGroupBuckets(String user, Object source);
static void getGroupFirstKey(Object source) {
BASE_LOGGER.getGroupFirstKey(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601276, value = "User {0} is getting group first key on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getGroupFirstKey(String user, Object source, Object... args);
+ @LogMessage(id = 601276, value = "User {} is getting group first key on target resource: {}", level = LogMessage.Level.INFO)
+ void getGroupFirstKey(String user, Object source);
static void getCurrentDuplicateIdCacheSize(Object source) {
BASE_LOGGER.getCurrentDuplicateIdCacheSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601509, value = "User {0} is getting currentDuplicateIdCacheSize property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getCurrentDuplicateIdCacheSize(String user, Object source, Object... args);
+ @LogMessage(id = 601509, value = "User {} is getting currentDuplicateIdCacheSize property on target resource: {}", level = LogMessage.Level.INFO)
+ void getCurrentDuplicateIdCacheSize(String user, Object source);
static void clearDuplicateIdCache(Object source) {
BASE_LOGGER.clearDuplicateIdCache(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601510, value = "User {0} is clearing duplicate ID cache on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void clearDuplicateIdCache(String user, Object source, Object... args);
+ @LogMessage(id = 601510, value = "User {} is clearing duplicate ID cache on target resource: {}", level = LogMessage.Level.INFO)
+ void clearDuplicateIdCache(String user, Object source);
static void getChannelName(Object source) {
BASE_LOGGER.getChannelName(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601511, value = "User {0} is getting channelName property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getChannelName(String user, Object source, Object... args);
+ @LogMessage(id = 601511, value = "User {} is getting channelName property on target resource: {}", level = LogMessage.Level.INFO)
+ void getChannelName(String user, Object source);
static void getFileContents(Object source) {
BASE_LOGGER.getFileContents(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601512, value = "User {0} is getting fileContents property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getFileContents(String user, Object source, Object... args);
+ @LogMessage(id = 601512, value = "User {} is getting fileContents property on target resource: {}", level = LogMessage.Level.INFO)
+ void getFileContents(String user, Object source);
static void getFile(Object source) {
BASE_LOGGER.getFile(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601513, value = "User {0} is getting file property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getFile(String user, Object source, Object... args);
+ @LogMessage(id = 601513, value = "User {} is getting file property on target resource: {}", level = LogMessage.Level.INFO)
+ void getFile(String user, Object source);
static void getPreparedTransactionMessageCount(Object source) {
BASE_LOGGER.getPreparedTransactionMessageCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601514, value = "User {0} is getting preparedTransactionMessageCount property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getPreparedTransactionMessageCount(String user, Object source, Object... args);
+ @LogMessage(id = 601514, value = "User {} is getting preparedTransactionMessageCount property on target resource: {}", level = LogMessage.Level.INFO)
+ void getPreparedTransactionMessageCount(String user, Object source);
/*
* This logger is for message production and consumption and is on the hot path so enabled independently
@@ -2424,8 +2134,7 @@ public interface AuditLogger extends BasicLogger {
MESSAGE_LOGGER.coreSendMessage(getCaller(user, remoteAddress), messageToString, context, tx);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601500, value = "User {0} sent a message {1}, context: {2}, transaction: {3}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601500, value = "User {} sent a message {}, context: {}, transaction: {}", level = LogMessage.Level.INFO)
void coreSendMessage(String user, String messageToString, Object context, String tx);
//hot path log using a different logger
@@ -2433,8 +2142,7 @@ public interface AuditLogger extends BasicLogger {
MESSAGE_LOGGER.consumeMessage(getCaller(user, remoteAddress), queue, message);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601501, value = "User {0} is consuming a message from {1}: {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601501, value = "User {} is consuming a message from {}: {}", level = LogMessage.Level.INFO)
void consumeMessage(String user, String address, String message);
//hot path log using a different logger
@@ -2442,8 +2150,7 @@ public interface AuditLogger extends BasicLogger {
MESSAGE_LOGGER.coreAcknowledgeMessage(getCaller(user, remoteAddress), queue, message, tx);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601502, value = "User {0} acknowledged message from {1}: {2}, transaction: {3}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601502, value = "User {} acknowledged message from {}: {}, transaction: {}", level = LogMessage.Level.INFO)
void coreAcknowledgeMessage(String user, String queue, String message, String tx);
/*
@@ -2454,40 +2161,35 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.createAddressSuccess(getCaller(), name, routingTypes);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601701, value = "User {0} successfully created address: {1} with routing types {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601701, value = "User {} successfully created address: {} with routing types {}", level = LogMessage.Level.INFO)
void createAddressSuccess(String user, String name, String routingTypes);
static void createAddressFailure(String name, String routingTypes) {
RESOURCE_LOGGER.createAddressFailure(getCaller(), name, routingTypes);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601702, value = "User {0} failed to created address: {1} with routing types {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601702, value = "User {} failed to created address: {} with routing types {}", level = LogMessage.Level.INFO)
void createAddressFailure(String user, String name, String routingTypes);
static void updateAddressSuccess(String name, String routingTypes) {
RESOURCE_LOGGER.updateAddressSuccess(getCaller(), name, routingTypes);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601703, value = "User {0} successfully updated address: {1} with routing types {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601703, value = "User {} successfully updated address: {} with routing types {}", level = LogMessage.Level.INFO)
void updateAddressSuccess(String user, String name, String routingTypes);
static void updateAddressFailure(String name, String routingTypes) {
RESOURCE_LOGGER.updateAddressFailure(getCaller(), name, routingTypes);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601704, value = "User {0} successfully updated address: {1} with routing types {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601704, value = "User {} successfully updated address: {} with routing types {}", level = LogMessage.Level.INFO)
void updateAddressFailure(String user, String name, String routingTypes);
static void deleteAddressSuccess(String name) {
RESOURCE_LOGGER.deleteAddressSuccess(getCaller(), name);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601705, value = "User {0} successfully deleted address: {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601705, value = "User {} successfully deleted address: {}", level = LogMessage.Level.INFO)
void deleteAddressSuccess(String user, String name);
@@ -2495,40 +2197,35 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.deleteAddressFailure(getCaller(), name);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601706, value = "User {0} failed to deleted address: {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601706, value = "User {} failed to deleted address: {}", level = LogMessage.Level.INFO)
void deleteAddressFailure(String user, String name);
static void createQueueSuccess(String name, String address, String routingType) {
RESOURCE_LOGGER.createQueueSuccess(getCaller(), name, address, routingType);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601707, value = "User {0} successfully created queue: {1} on address: {2} with routing type {3}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601707, value = "User {} successfully created queue: {} on address: {} with routing type {}", level = LogMessage.Level.INFO)
void createQueueSuccess(String user, String name, String address, String routingType);
static void createQueueFailure(String name, String address, String routingType) {
RESOURCE_LOGGER.createQueueFailure(getCaller(), name, address, routingType);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601708, value = "User {0} failed to create queue: {1} on address: {2} with routing type {3}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601708, value = "User {} failed to create queue: {} on address: {} with routing type {}", level = LogMessage.Level.INFO)
void createQueueFailure(String user, String name, String address, String routingType);
static void updateQueueSuccess(String name, String routingType) {
RESOURCE_LOGGER.updateQueueSuccess(getCaller(), name, routingType);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601709, value = "User {0} successfully updated queue: {1} with routing type {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601709, value = "User {} successfully updated queue: {} with routing type {}", level = LogMessage.Level.INFO)
void updateQueueSuccess(String user, String name, String routingType);
static void updateQueueFailure(String name, String routingType) {
RESOURCE_LOGGER.updateQueueFailure(getCaller(), name, routingType);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601710, value = "User {0} failed to update queue: {1} with routing type {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601710, value = "User {} failed to update queue: {} with routing type {}", level = LogMessage.Level.INFO)
void updateQueueFailure(String user, String name, String routingType);
@@ -2536,32 +2233,28 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.destroyQueueSuccess(getCaller(), name);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601711, value = "User {0} successfully deleted queue: {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601711, value = "User {} successfully deleted queue: {}", level = LogMessage.Level.INFO)
void destroyQueueSuccess(String user, String name);
static void destroyQueueFailure(String name) {
RESOURCE_LOGGER.destroyQueueFailure(getCaller(), name);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601712, value = "User {0} failed to delete queue: {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601712, value = "User {} failed to delete queue: {}", level = LogMessage.Level.INFO)
void destroyQueueFailure(String user, String name);
static void removeMessagesSuccess(int removed, String queue) {
RESOURCE_LOGGER.removeMessagesSuccess(getCaller(), removed, queue);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601713, value = "User {0} has removed {1} messages from queue: {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601713, value = "User {} has removed {} messages from queue: {}", level = LogMessage.Level.INFO)
void removeMessagesSuccess(String user, int removed, String queue);
static void removeMessagesFailure(String queue) {
RESOURCE_LOGGER.removeMessagesFailure(getCaller(), queue);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601714, value = "User {0} failed to remove messages from queue: {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601714, value = "User {} failed to remove messages from queue: {}", level = LogMessage.Level.INFO)
void removeMessagesFailure(String user, String queue);
static void userSuccesfullyAuthenticatedInAudit(Subject subject, String remoteAddress) {
@@ -2572,8 +2265,7 @@ public interface AuditLogger extends BasicLogger {
userSuccesfullyAuthenticatedInAudit(subject, null);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601715, value = "User {0} successfully authenticated", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601715, value = "User {} successfully authenticated", level = LogMessage.Level.INFO)
void userSuccesfullyAuthenticated(String caller);
@@ -2585,16 +2277,14 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.userFailedAuthentication(getCaller(subject, null), reason);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601716, value = "User {0} failed authentication, reason: {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601716, value = "User {} failed authentication, reason: {}", level = LogMessage.Level.INFO)
void userFailedAuthentication(String user, String reason);
static void objectInvokedSuccessfully(ObjectName objectName, String operationName) {
RESOURCE_LOGGER.objectInvokedSuccessfully(getCaller(), objectName, operationName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601717, value = "User {0} accessed {2} on management object {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601717, value = "User {} accessed {} on management object {}", level = LogMessage.Level.INFO)
void objectInvokedSuccessfully(String caller, ObjectName objectName, String operationName);
@@ -2602,16 +2292,14 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.objectInvokedFailure(getCaller(), objectName, operationName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601718, value = "User {0} does not have correct role to access {2} on management object {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601718, value = "User {} does not have correct role to access {} on management object {}", level = LogMessage.Level.INFO)
void objectInvokedFailure(String caller, ObjectName objectName, String operationName);
static void pauseQueueSuccess(String queueName) {
RESOURCE_LOGGER.pauseQueueSuccess(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601719, value = "User {0} has paused queue {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601719, value = "User {} has paused queue {}", level = LogMessage.Level.INFO)
void pauseQueueSuccess(String user, String queueName);
@@ -2619,8 +2307,7 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.pauseQueueFailure(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601720, value = "User {0} failed to pause queue {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601720, value = "User {} failed to pause queue {}", level = LogMessage.Level.INFO)
void pauseQueueFailure(String user, String queueName);
@@ -2628,8 +2315,7 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.resumeQueueSuccess(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601721, value = "User {0} has resumed queue {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601721, value = "User {} has resumed queue {}", level = LogMessage.Level.INFO)
void resumeQueueSuccess(String user, String queueName);
@@ -2637,80 +2323,70 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.pauseQueueFailure(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601722, value = "User {0} failed to resume queue {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601722, value = "User {} failed to resume queue {}", level = LogMessage.Level.INFO)
void resumeQueueFailure(String user, String queueName);
static void sendMessageSuccess(String queueName, String user) {
RESOURCE_LOGGER.sendMessageSuccess(getCaller(), queueName, user);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601723, value = "User {0} sent message to {1} as user {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601723, value = "User {} sent message to {} as user {}", level = LogMessage.Level.INFO)
void sendMessageSuccess(String user, String queueName, String sendUser);
static void sendMessageFailure(String queueName, String user) {
RESOURCE_LOGGER.sendMessageFailure(getCaller(), queueName, user);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601724, value = "User {0} failed to send message to {1} as user {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601724, value = "User {} failed to send message to {} as user {}", level = LogMessage.Level.INFO)
void sendMessageFailure(String user, String queueName, String sendUser);
static void browseMessagesSuccess(String queueName, int numMessages) {
RESOURCE_LOGGER.browseMessagesSuccess(getCaller(), queueName, numMessages);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601725, value = "User {0} browsed {2} messages from queue {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601725, value = "User {} browsed {} messages from queue {}", level = LogMessage.Level.INFO)
void browseMessagesSuccess(String user, String queueName, int numMessages);
static void browseMessagesFailure(String queueName) {
RESOURCE_LOGGER.browseMessagesFailure(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601726, value = "User {0} failed to browse messages from queue {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601726, value = "User {} failed to browse messages from queue {}", level = LogMessage.Level.INFO)
void browseMessagesFailure(String user, String queueName);
static void updateDivert(Object source, Object... args) {
- BASE_LOGGER.updateDivert(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.updateDivert(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601727, value = "User {0} is updating a divert on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void updateDivert(String user, Object source, Object... args);
+ @LogMessage(id = 601727, value = "User {} is updating a divert on target resource: {} {}", level = LogMessage.Level.INFO)
+ void updateDivert(String user, Object source, String arg);
static void isEnabled(Object source) {
BASE_LOGGER.isEnabled(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601728, value = "User {0} is getting enabled property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isEnabled(String user, Object source, Object... args);
+ @LogMessage(id = 601728, value = "User {} is getting enabled property on target resource: {}", level = LogMessage.Level.INFO)
+ void isEnabled(String user, Object source);
static void disable(Object source, Object... args) {
- BASE_LOGGER.disable(getCaller(), source, arrayToString(args));
+ BASE_LOGGER.disable(getCaller(), source, parametersList(args));
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601729, value = "User {0} is disabling on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void disable(String user, Object source, Object... args);
+ @LogMessage(id = 601729, value = "User {} is disabling on target resource: {} {}", level = LogMessage.Level.INFO)
+ void disable(String user, Object source, String arg);
static void enable(Object source) {
BASE_LOGGER.resume(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601730, value = "User {0} is enabling on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void enable(String user, Object source, Object... args);
+ @LogMessage(id = 601730, value = "User {} is enabling on target resource: {}", level = LogMessage.Level.INFO)
+ void enable(String user, Object source);
static void pauseAddressSuccess(String queueName) {
RESOURCE_LOGGER.pauseAddressSuccess(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601731, value = "User {0} has paused address {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601731, value = "User {} has paused address {}", level = LogMessage.Level.INFO)
void pauseAddressSuccess(String user, String queueName);
@@ -2718,8 +2394,7 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.pauseAddressFailure(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601732, value = "User {0} failed to pause address {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601732, value = "User {} failed to pause address {}", level = LogMessage.Level.INFO)
void pauseAddressFailure(String user, String queueName);
@@ -2727,8 +2402,7 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.resumeAddressSuccess(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601733, value = "User {0} has resumed address {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601733, value = "User {} has resumed address {}", level = LogMessage.Level.INFO)
void resumeAddressSuccess(String user, String queueName);
@@ -2736,145 +2410,127 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.resumeAddressFailure(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601734, value = "User {0} failed to resume address {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601734, value = "User {} failed to resume address {}", level = LogMessage.Level.INFO)
void resumeAddressFailure(String user, String queueName);
static void isGroupRebalancePauseDispatch(Object source) {
BASE_LOGGER.isGroupRebalancePauseDispatch(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601735, value = "User {0} is getting group rebalance pause dispatch property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isGroupRebalancePauseDispatch(String user, Object source, Object... args);
+ @LogMessage(id = 601735, value = "User {} is getting group rebalance pause dispatch property on target resource: {}", level = LogMessage.Level.INFO)
+ void isGroupRebalancePauseDispatch(String user, Object source);
static void getAuthenticationCacheSize(Object source) {
BASE_LOGGER.getAuthenticationCacheSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601736, value = "User {0} is getting authentication cache size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAuthenticationCacheSize(String user, Object source, Object... args);
+ @LogMessage(id = 601736, value = "User {} is getting authentication cache size on target resource: {}", level = LogMessage.Level.INFO)
+ void getAuthenticationCacheSize(String user, Object source);
static void getAuthorizationCacheSize(Object source) {
BASE_LOGGER.getAuthorizationCacheSize(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601737, value = "User {0} is getting authorization cache size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAuthorizationCacheSize(String user, Object source, Object... args);
+ @LogMessage(id = 601737, value = "User {} is getting authorization cache size on target resource: {}", level = LogMessage.Level.INFO)
+ void getAuthorizationCacheSize(String user, Object source);
static void listBrokerConnections() {
BASE_LOGGER.listBrokerConnections(getCaller());
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601738, value = "User {0} is requesting a list of broker connections", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601738, value = "User {} is requesting a list of broker connections", level = LogMessage.Level.INFO)
void listBrokerConnections(String user);
static void stopBrokerConnection(String name) {
BASE_LOGGER.stopBrokerConnection(getCaller(), name);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601739, value = "User {0} is requesting to stop broker connection {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601739, value = "User {} is requesting to stop broker connection {}", level = LogMessage.Level.INFO)
void stopBrokerConnection(String user, String name);
static void startBrokerConnection(String name) {
BASE_LOGGER.startBrokerConnection(getCaller(), name);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601740, value = "User {0} is requesting to start broker connection {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601740, value = "User {} is requesting to start broker connection {}", level = LogMessage.Level.INFO)
void startBrokerConnection(String user, String name);
static void getAddressCount(Object source) {
BASE_LOGGER.getAddressCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601741, value = "User {0} is getting address count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAddressCount(String user, Object source, Object... args);
+ @LogMessage(id = 601741, value = "User {} is getting address count on target resource: {}", level = LogMessage.Level.INFO)
+ void getAddressCount(String user, Object source);
static void getQueueCount(Object source) {
BASE_LOGGER.getQueueCount(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601742, value = "User {0} is getting the queue count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getQueueCount(String user, Object source, Object... args);
+ @LogMessage(id = 601742, value = "User {} is getting the queue count on target resource: {}", level = LogMessage.Level.INFO)
+ void getQueueCount(String user, Object source);
static void lastValueKey(Object source) {
BASE_LOGGER.lastValueKey(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601743, value = "User {0} is getting last-value-key property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void lastValueKey(String user, Object source, Object... args);
+ @LogMessage(id = 601743, value = "User {} is getting last-value-key property on target resource: {}", level = LogMessage.Level.INFO)
+ void lastValueKey(String user, Object source);
static void consumersBeforeDispatch(Object source) {
BASE_LOGGER.consumersBeforeDispatch(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601744, value = "User {0} is getting consumers-before-dispatch property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void consumersBeforeDispatch(String user, Object source, Object... args);
+ @LogMessage(id = 601744, value = "User {} is getting consumers-before-dispatch property on target resource: {}", level = LogMessage.Level.INFO)
+ void consumersBeforeDispatch(String user, Object source);
static void delayBeforeDispatch(Object source) {
BASE_LOGGER.delayBeforeDispatch(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601745, value = "User {0} is getting delay-before-dispatch property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void delayBeforeDispatch(String user, Object source, Object... args);
+ @LogMessage(id = 601745, value = "User {} is getting delay-before-dispatch property on target resource: {}", level = LogMessage.Level.INFO)
+ void delayBeforeDispatch(String user, Object source);
static void isInternal(Object source) {
BASE_LOGGER.isInternal(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601746, value = "User {0} is getting internal property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isInternal(String user, Object source, Object... args);
+ @LogMessage(id = 601746, value = "User {} is getting internal property on target resource: {}", level = LogMessage.Level.INFO)
+ void isInternal(String user, Object source);
static void isAutoCreated(Object source) {
BASE_LOGGER.isAutoCreated(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601747, value = "User {0} is getting auto-created property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void isAutoCreated(String user, Object source, Object... args);
+ @LogMessage(id = 601747, value = "User {} is getting auto-created property on target resource: {}", level = LogMessage.Level.INFO)
+ void isAutoCreated(String user, Object source);
static void getMaxRetryInterval(Object source) {
BASE_LOGGER.getMaxRetryInterval(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601748, value = "User {0} is getting max retry interval on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getMaxRetryInterval(String user, Object source, Object... args);
+ @LogMessage(id = 601748, value = "User {} is getting max retry interval on target resource: {}", level = LogMessage.Level.INFO)
+ void getMaxRetryInterval(String user, Object source);
static void getActivationSequence(Object source) {
BASE_LOGGER.getActivationSequence(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601749, value = "User {0} is getting activation sequence on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getActivationSequence(String user, Object source, Object... args);
+ @LogMessage(id = 601749, value = "User {} is getting activation sequence on target resource: {}", level = LogMessage.Level.INFO)
+ void getActivationSequence(String user, Object source);
static void purge(Object source) {
RESOURCE_LOGGER.purge(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601750, value = "User {0} is purging target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void purge(String user, Object source, Object... args);
+ @LogMessage(id = 601750, value = "User {} is purging target resource: {}", level = LogMessage.Level.INFO)
+ void purge(String user, Object source);
static void purgeAddressSuccess(String queueName) {
RESOURCE_LOGGER.purgeAddressSuccess(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601751, value = "User {0} has purged address {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601751, value = "User {} has purged address {}", level = LogMessage.Level.INFO)
void purgeAddressSuccess(String user, String queueName);
@@ -2882,56 +2538,49 @@ public interface AuditLogger extends BasicLogger {
RESOURCE_LOGGER.purgeAddressFailure(getCaller(), queueName);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601752, value = "User {0} failed to purge address {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601752, value = "User {} failed to purge address {}", level = LogMessage.Level.INFO)
void purgeAddressFailure(String user, String queueName);
static void getAddressLimitPercent(Object source) {
BASE_LOGGER.getAddressLimitPercent(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601753, value = "User {0} is getting address limit % on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAddressLimitPercent(String user, Object source, Object... args);
+ @LogMessage(id = 601753, value = "User {} is getting address limit % on target resource: {}", level = LogMessage.Level.INFO)
+ void getAddressLimitPercent(String user, Object source);
static void block(Object source) {
BASE_LOGGER.block(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601754, value = "User {0} is blocking target resource: {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601754, value = "User {} is blocking target resource: {}", level = LogMessage.Level.INFO)
void block(String user, Object source);
static void unBlock(Object source) {
BASE_LOGGER.unBlock(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601755, value = "User {0} is unblocking target resource: {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601755, value = "User {} is unblocking target resource: {}", level = LogMessage.Level.INFO)
void unBlock(String user, Object source);
static void getAcceptors(Object source) {
BASE_LOGGER.getAcceptors(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601756, value = "User {0} is getting acceptors on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAcceptors(String user, Object source, Object... args);
+ @LogMessage(id = 601756, value = "User {} is getting acceptors on target resource: {}", level = LogMessage.Level.INFO)
+ void getAcceptors(String user, Object source);
static void getAcceptorsAsJSON(Object source) {
BASE_LOGGER.getAcceptorsAsJSON(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601757, value = "User {0} is getting acceptors as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
- void getAcceptorsAsJSON(String user, Object source, Object... args);
+ @LogMessage(id = 601757, value = "User {} is getting acceptors as json on target resource: {}", level = LogMessage.Level.INFO)
+ void getAcceptorsAsJSON(String user, Object source);
static void schedulePageCleanup(Object source) {
BASE_LOGGER.schedulePageCleanup(getCaller(), source);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601758, value = "User {0} is calling schedulePageCleanup on address: {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601758, value = "User {} is calling schedulePageCleanup on address: {}", level = LogMessage.Level.INFO)
void schedulePageCleanup(String user, Object address);
//hot path log using a different logger
@@ -2939,8 +2588,7 @@ public interface AuditLogger extends BasicLogger {
MESSAGE_LOGGER.addAckToTransaction(getCaller(user, remoteAddress), queue, message, tx);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601759, value = "User {0} added acknowledgement of a message from {1}: {2} to transaction: {3}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601759, value = "User {} added acknowledgement of a message from {}: {} to transaction: {}", level = LogMessage.Level.INFO)
void addAckToTransaction(String user, String queue, String message, String tx);
//hot path log using a different logger
@@ -2948,8 +2596,7 @@ public interface AuditLogger extends BasicLogger {
MESSAGE_LOGGER.addSendToTransaction(getCaller(user, remoteAddress), messageToString, tx);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601760, value = "User {0} added a message send for: {1} to transaction: {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601760, value = "User {} added a message send for: {} to transaction: {}", level = LogMessage.Level.INFO)
void addSendToTransaction(String user, String messageToString, String tx);
//hot path log using a different logger
@@ -2957,7 +2604,6 @@ public interface AuditLogger extends BasicLogger {
MESSAGE_LOGGER.rolledBackTransaction(getCaller(user, remoteAddress), tx, resource);
}
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 601761, value = "User {0} rolled back transaction {1} involving {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 601761, value = "User {} rolled back transaction {} involving {}", level = LogMessage.Level.INFO)
void rolledBackTransaction(String user, String tx, String resource);
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java
deleted file mode 100644
index 78242a2572..0000000000
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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.logs;
-
-import org.apache.commons.logging.Log;
-import org.jboss.logging.Logger;
-
-/**
- * There is an issue on the Testsuite, as it's not possible
- * to bring JBossLogging on the booting classLoader.
- * As a result classes like BeanUtils will be using apache logging,
- * which will not have the bootstrapping necessary.
- *
- * As a result BeanUtils is keeping showing log.debug into the test output and test console.
- *
- * This class will give an opportunity to the CI and our applications to use proper logging even on the testsuite.
- * */
-public class JBossLoggingApacheLoggerBridge implements Log {
-
- final Logger bridgeLog;
-
- public JBossLoggingApacheLoggerBridge(Class clazz) {
- bridgeLog = Logger.getLogger(clazz);
- }
-
- public JBossLoggingApacheLoggerBridge(String name) {
- bridgeLog = Logger.getLogger(name);
- }
-
- @Override
- public void debug(Object message) {
- bridgeLog.debug(message);
- }
-
- @Override
- public void debug(Object message, Throwable t) {
- bridgeLog.debug(message, t);
- }
-
- @Override
- public void error(Object message) {
- bridgeLog.error(message);
- }
-
- @Override
- public void error(Object message, Throwable t) {
- bridgeLog.error(message, t);
- }
-
- @Override
- public void fatal(Object message) {
- bridgeLog.fatal(message);
- }
-
- @Override
- public void fatal(Object message, Throwable t) {
- bridgeLog.fatal(message, t);
- }
-
- @Override
- public void info(Object message) {
- bridgeLog.info(message);
- }
-
- @Override
- public void info(Object message, Throwable t) {
- bridgeLog.info(message, t);
- }
-
- @Override
- public boolean isDebugEnabled() {
- return bridgeLog.isDebugEnabled();
- }
-
- @Override
- public boolean isErrorEnabled() {
- return bridgeLog.isEnabled(Logger.Level.ERROR);
- }
-
- @Override
- public boolean isFatalEnabled() {
- return bridgeLog.isEnabled(Logger.Level.FATAL);
- }
-
- @Override
- public boolean isInfoEnabled() {
- return bridgeLog.isInfoEnabled();
- }
-
- @Override
- public boolean isTraceEnabled() {
- return bridgeLog.isTraceEnabled();
- }
-
- @Override
- public boolean isWarnEnabled() {
- return bridgeLog.isEnabled(Logger.Level.WARN);
- }
-
- @Override
- public void trace(Object message) {
- bridgeLog.trace(message);
- }
-
- @Override
- public void trace(Object message, Throwable t) {
- bridgeLog.trace(message, t);
- }
-
- @Override
- public void warn(Object message) {
- bridgeLog.warn(message);
- }
-
- @Override
- public void warn(Object message, Throwable t) {
- bridgeLog.warn(message, t);
- }
-}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
index 8c5fec9e6d..10a301699f 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
@@ -29,7 +29,7 @@ import io.netty.util.internal.PlatformDependent;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
public class ByteUtil {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
index b56e3a09b8..b848ed7a38 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
@@ -19,7 +19,8 @@ package org.apache.activemq.artemis.utils;
import java.net.URL;
import java.util.Properties;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class will be used to perform generic class-loader operations,
@@ -30,7 +31,7 @@ import org.jboss.logging.Logger;
public final class ClassloadingUtil {
- private static final Logger logger = Logger.getLogger(ClassloadingUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(ClassloadingUtil.class);
private static final String INSTANTIATION_EXCEPTION_MESSAGE = "Your class must have a constructor without arguments. If it is an inner class, it must be static!";
@@ -135,7 +136,7 @@ public final class ClassloadingUtil {
properties.load(url.openStream());
}
} catch (Throwable ignored) {
- logger.warn(ignored);
+ logger.warn(ignored.getMessage(), ignored);
}
return properties;
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
index 59e0ad820b..16ac0b04de 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
@@ -32,7 +32,8 @@ import java.util.Map;
import java.util.Objects;
import java.util.Properties;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A DefaultSensitiveDataCodec
@@ -48,7 +49,7 @@ import org.jboss.logging.Logger;
*/
public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String> {
- private static final Logger logger = Logger.getLogger(DefaultSensitiveStringCodec.class);
+ private static final Logger logger = LoggerFactory.getLogger(DefaultSensitiveStringCodec.class);
public static final String ALGORITHM = "algorithm";
public static final String BLOWFISH_KEY = "key";
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
index 9d33ef0858..f98ef35c6d 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
@@ -20,7 +20,8 @@ package org.apache.activemq.artemis.utils;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SizeAwareMetric {
@@ -28,7 +29,7 @@ public class SizeAwareMetric {
void add(int delta, boolean sizeOnly);
}
- private static final Logger logger = Logger.getLogger(SizeAwareMetric.class);
+ private static final Logger logger = LoggerFactory.getLogger(SizeAwareMetric.class);
private static final int PENDING_FREE = 0, FREE = 1, PENDING_OVER_SIZE = 2, OVER_SIZE = 3, PENDING_OVER_ELEMENTS = 4, OVER_ELEMENTS = 5, NOT_USED = -1;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
index e71c57ffcb..87548fc150 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
@@ -27,13 +27,14 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SpawnedVMSupport {
static ConcurrentHashMap<Process, String> startedProcesses = null;
- private static final Logger log = Logger.getLogger(SpawnedVMSupport.class);
+ private static final Logger log = LoggerFactory.getLogger(SpawnedVMSupport.class);
public static Process spawnVM(final String className, final String... args) throws Exception {
return SpawnedVMSupport.spawnVM(className, new String[0], true, args);
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ThreadDumpUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ThreadDumpUtil.java
index 2d942615c3..69d762bcc4 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ThreadDumpUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ThreadDumpUtil.java
@@ -19,7 +19,8 @@
package org.apache.activemq.artemis.utils;
-import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,6 +32,7 @@ import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
public final class ThreadDumpUtil {
+ private static final Logger logger = LoggerFactory.getLogger(ThreadDumpUtil.class);
public static String threadDump(final String msg) {
@@ -66,7 +68,7 @@ public final class ThreadDumpUtil {
return str.toString();
} catch (IOException e) {
- ActiveMQUtilLogger.LOGGER.error("Exception thrown during generating of thread dump.", e);
+ logger.error("Exception thrown during generating of thread dump.", e);
}
return "Generating of thread dump failed " + msg;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
index 66f3ec01ab..f57fff54ca 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
@@ -23,7 +23,8 @@ import io.netty.util.internal.PlatformDependent;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
-import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A UTF8Util
@@ -32,6 +33,8 @@ import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
*/
public final class UTF8Util {
+ private static final Logger logger = LoggerFactory.getLogger(UTF8Util.class);
+
private static final ThreadLocal<SoftReference<StringUtilBuffer>> currentBuffer = new ThreadLocal<>();
private UTF8Util() {
@@ -85,9 +88,9 @@ public final class UTF8Util {
final int stringLength = str.length();
- if (ActiveMQUtilLogger.LOGGER.isTraceEnabled()) {
+ if (logger.isTraceEnabled()) {
// This message is too verbose for debug, that's why we are using trace here
- ActiveMQUtilLogger.LOGGER.trace("Saving string with utfSize=" + len + " stringSize=" + stringLength);
+ logger.trace("Saving string with utfSize=" + len + " stringSize=" + stringLength);
}
if (out.hasArray()) {
@@ -183,9 +186,9 @@ public final class UTF8Util {
final int size = input.readUnsignedShort();
- if (ActiveMQUtilLogger.LOGGER.isTraceEnabled()) {
+ if (logger.isTraceEnabled()) {
// This message is too verbose for debug, that's why we are using trace here
- ActiveMQUtilLogger.LOGGER.trace("Reading string with utfSize=" + size);
+ logger.trace("Reading string with utfSize=" + size);
}
if (PlatformDependent.hasUnsafe() && input.byteBuf() != null && input.byteBuf().hasMemoryAddress()) {
final ByteBuf byteBuf = input.byteBuf();
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
index c59ca1c83d..fcbafe5d5a 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
@@ -32,10 +32,13 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class UUIDGenerator {
+ private static final Logger logger = LoggerFactory.getLogger(UUIDGenerator.class);
+
private static final UUIDGenerator sSingleton = new UUIDGenerator();
// Windows has some fake adapters that will return the same HARDWARE ADDRESS on any computer. We need to ignore those
@@ -122,8 +125,8 @@ public final class UUIDGenerator {
*/
dummy[0] |= (byte) 0x01;
- if (ActiveMQUtilLogger.LOGGER.isDebugEnabled()) {
- ActiveMQUtilLogger.LOGGER.debug("using dummy address " + UUIDGenerator.asString(dummy));
+ if (logger.isDebugEnabled()) {
+ logger.debug("using dummy address " + UUIDGenerator.asString(dummy));
}
return dummy;
}
@@ -153,8 +156,8 @@ public final class UUIDGenerator {
byte[] address = findFirstMatchingHardwareAddress(ifaces);
if (address != null) {
- if (ActiveMQUtilLogger.LOGGER.isDebugEnabled()) {
- ActiveMQUtilLogger.LOGGER.debug("using hardware address " + UUIDGenerator.asString(address));
+ if (logger.isDebugEnabled()) {
+ logger.debug("using hardware address " + UUIDGenerator.asString(address));
}
return address;
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/OrderedExecutor.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/OrderedExecutor.java
index 8a02497b00..b941f59d20 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/OrderedExecutor.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/OrderedExecutor.java
@@ -20,7 +20,8 @@ package org.apache.activemq.artemis.utils.actors;
import java.util.concurrent.Executor;
import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An executor that always runs all tasks in order, using a delegate executor to run the tasks.
@@ -34,7 +35,7 @@ public class OrderedExecutor extends ProcessorBase<Runnable> implements ArtemisE
super(delegate);
}
- private static final Logger logger = Logger.getLogger(OrderedExecutor.class);
+ private static final Logger logger = LoggerFactory.getLogger(OrderedExecutor.class);
@Override
protected final void doTask(Runnable task) {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java
index 67dcb5cdb3..850330a971 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java
@@ -24,11 +24,12 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.function.Consumer;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class ProcessorBase<T> extends HandlerBase {
- private static final Logger logger = Logger.getLogger(ProcessorBase.class);
+ private static final Logger logger = LoggerFactory.getLogger(ProcessorBase.class);
public static final int STATE_NOT_RUNNING = 0;
public static final int STATE_RUNNING = 1;
public static final int STATE_FORCED_SHUTDOWN = 2;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java
index 6b00b87179..21e1e33b94 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java
@@ -21,11 +21,12 @@ import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.function.ToIntFunction;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ThresholdActor<T> extends ProcessorBase<Object> {
- private static final Logger logger = Logger.getLogger(ThresholdActor.class);
+ private static final Logger logger = LoggerFactory.getLogger(ThresholdActor.class);
private static final AtomicIntegerFieldUpdater<ThresholdActor> SIZE_UPDATER = AtomicIntegerFieldUpdater.newUpdater(ThresholdActor.class, "size");
private volatile int size = 0;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
index 4188524cf4..cf1fb60edb 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
@@ -26,7 +26,8 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.locks.StampedLock;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.activemq.artemis.utils.Preconditions.checkArgument;
@@ -40,7 +41,7 @@ import static org.apache.activemq.artemis.utils.Preconditions.checkArgument;
*/
public class ConcurrentLongHashSet {
- private static final Logger logger = Logger.getLogger(ConcurrentLongHashSet.class);
+ private static final Logger logger = LoggerFactory.getLogger(ConcurrentLongHashSet.class);
private static final long EmptyItem = -1L;
private static final long DeletedItem = -2L;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java
index 528d15f488..e7363bd771 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java
@@ -24,11 +24,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.artemis.core.server.ActiveMQScheduledComponent;
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CriticalAnalyzerImpl implements CriticalAnalyzer {
- private final Logger logger = Logger.getLogger(CriticalAnalyzer.class);
+ private final Logger logger = LoggerFactory.getLogger(CriticalAnalyzer.class);
private volatile long timeoutNanoSeconds;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java
index 16fa099dc5..292808db1d 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java
@@ -20,7 +20,8 @@ package org.apache.activemq.artemis.utils.critical;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import org.apache.activemq.artemis.utils.ArtemisCloseable;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CriticalMeasure {
@@ -28,7 +29,7 @@ public class CriticalMeasure {
return closeable == dummyCloseable;
}
- private static final Logger logger = Logger.getLogger(CriticalMeasure.class);
+ private static final Logger logger = LoggerFactory.getLogger(CriticalMeasure.class);
// this is used on enterCritical, if the logger is in trace mode
private volatile Exception traceEnter;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java
index ad56353eef..cd88b7aa26 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java
@@ -26,11 +26,12 @@ import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
import org.apache.commons.beanutils.FluentPropertyBeanIntrospector;
import org.apache.commons.beanutils.IntrospectionContext;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FluentPropertyBeanIntrospectorWithIgnores extends FluentPropertyBeanIntrospector {
- static Logger logger = Logger.getLogger(FluentPropertyBeanIntrospectorWithIgnores.class);
+ static Logger logger = LoggerFactory.getLogger(FluentPropertyBeanIntrospectorWithIgnores.class);
private static ConcurrentHashSet<Pair<String, String>> ignores = new ConcurrentHashSet<>();
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
index b4eea724ed..efa686c174 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
@@ -27,7 +27,8 @@ import java.util.Map;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.util.internal.PlatformDependent;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
@@ -39,7 +40,7 @@ import static org.junit.Assert.fail;
public class ByteUtilTest {
- private static final Logger log = Logger.getLogger(ByteUtilTest.class);
+ private static final Logger log = LoggerFactory.getLogger(ByteUtilTest.class);
@Test
public void testBytesToString() {
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java
index c670345fa0..e9993c15f2 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.activemq.artemis.utils;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
import java.util.HashMap;
@@ -29,7 +30,7 @@ import static org.junit.Assert.fail;
public class DefaultSensitiveStringCodecTest {
- private static final Logger log = Logger.getLogger(DefaultSensitiveStringCodecTest.class);
+ private static final Logger log = LoggerFactory.getLogger(DefaultSensitiveStringCodecTest.class);
@Test
public void testDefaultAlgorithm() throws Exception {
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java
index 86cdf81a31..8223efc979 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java
@@ -26,12 +26,13 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Assert;
import org.junit.Test;
public class OrderedExecutorSanityTest {
- private static final Logger log = Logger.getLogger(OrderedExecutorSanityTest.class);
+ private static final Logger log = LoggerFactory.getLogger(OrderedExecutorSanityTest.class);
@Test
public void shouldExecuteTasksInOrder() throws InterruptedException {
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java
index 61fccf8160..591afd494f 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java
@@ -27,13 +27,14 @@ import java.util.concurrent.locks.LockSupport;
import org.apache.activemq.artemis.utils.ReusableLatch;
import org.apache.activemq.artemis.utils.Wait;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Assert;
import org.junit.Test;
public class MultiThreadCriticalMeasureTest {
- private static final Logger logger = Logger.getLogger(MultiThreadCriticalMeasureTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(MultiThreadCriticalMeasureTest.class);
@Test
public void testMultiThread() throws Throwable {
diff --git a/artemis-core-client-osgi/pom.xml b/artemis-core-client-osgi/pom.xml
index 4919974d75..3fcb87d53a 100644
--- a/artemis-core-client-osgi/pom.xml
+++ b/artemis-core-client-osgi/pom.xml
@@ -41,33 +41,15 @@
<artifactId>artemis-core-client</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- logging -->
<dependency>
- <groupId>org.jboss.logmanager</groupId>
- <artifactId>jboss-logmanager</artifactId>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.wildfly.common</groupId>
- <artifactId>wildfly-common</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
@@ -100,6 +82,7 @@
<Import-Package>
org.glassfish.json*;resolution:=optional,
io.netty.buffer;io.netty.*;version="[4.1,5)",
+ org.apache.activemq.artemis.logprocessor.*;resolution:=optional,
*
</Import-Package>
<_exportcontents>org.apache.activemq.artemis.*;-noimport:=true</_exportcontents>
diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
index 541ced4343..63895189bd 100644
--- a/artemis-core-client/pom.xml
+++ b/artemis-core-client/pom.xml
@@ -32,35 +32,23 @@
</properties>
<dependencies>
+ <!-- logging -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-processor</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
+ <!-- Superfluous, except for osgi manifest handling -->
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jboss.logmanager</groupId>
- <artifactId>jboss-logmanager</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.wildfly.common</groupId>
- <artifactId>wildfly-common</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jgroups</groupId>
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index 734d58261b..ef3d870854 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -23,14 +23,15 @@ import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.server.ComponentConfigurationRoutingType;
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerPolicy;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default values of ActiveMQ Artemis configuration parameters.
*/
public final class ActiveMQDefaultConfiguration {
- private static final Logger logger = Logger.getLogger(ActiveMQDefaultConfiguration.class);
+ private static final Logger logger = LoggerFactory.getLogger(ActiveMQDefaultConfiguration.class);
/*
* <p> In order to avoid compile time in-lining of constants, all access is done through methods
@@ -509,7 +510,7 @@ public final class ActiveMQDefaultConfiguration {
maxDisk = Integer.parseInt(System.getProperty(ActiveMQDefaultConfiguration.getDefaultSystemPropertyPrefix() + "maxDiskUsage", "90"));
} catch (Throwable e) {
// This is not really supposed to happen, so just logging it, just in case
- logger.warn(e);
+ logger.warn(e.getMessage(), e);
maxDisk = 90;
}
DEFAULT_MAX_DISK_USAGE = maxDisk;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
index 66b61d3153..15acbcee55 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
@@ -17,7 +17,8 @@
package org.apache.activemq.artemis.api.core;
import org.apache.activemq.artemis.api.core.jgroups.JChannelManager;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jgroups.JChannel;
/**
@@ -27,7 +28,7 @@ import org.jgroups.JChannel;
*/
public class ChannelBroadcastEndpointFactory implements BroadcastEndpointFactory {
- private static final Logger logger = Logger.getLogger(ChannelBroadcastEndpointFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(ChannelBroadcastEndpointFactory.class);
private final JChannel channel;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
index a02ff28751..68b549c41f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
@@ -21,7 +21,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.activemq.artemis.api.core.jgroups.JChannelManager;
import org.apache.activemq.artemis.api.core.jgroups.JChannelWrapper;
import org.apache.activemq.artemis.api.core.jgroups.JGroupsReceiver;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jgroups.JChannel;
/**
@@ -29,7 +30,7 @@ import org.jgroups.JChannel;
*/
public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint {
- private static final Logger logger = Logger.getLogger(JGroupsBroadcastEndpoint.class);
+ private static final Logger logger = LoggerFactory.getLogger(JGroupsBroadcastEndpoint.class);
private final String channelName;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java
index 682bf7645e..4e72dda303 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java
@@ -21,7 +21,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.activemq.artemis.api.core.JGroupsBroadcastEndpoint;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class maintain a global Map of JChannels wrapped in JChannelWrapper for
@@ -54,7 +55,7 @@ public class JChannelManager {
// this is useful for testcases using a single channel.
private boolean loopbackMessages = false;
- private final Logger logger = Logger.getLogger(JChannelManager.class);
+ private final Logger logger = LoggerFactory.getLogger(JChannelManager.class);
private static final Map<String, JChannelWrapper> channels = new HashMap<>();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
index cc2d8f93d8..d57bfd306f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
@@ -20,10 +20,11 @@ package org.apache.activemq.artemis.api.core.jgroups;
import java.util.ArrayList;
import java.util.List;
-import org.jboss.logging.Logger;
import org.jgroups.JChannel;
import org.jgroups.Message;
import org.jgroups.Receiver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class wraps a JChannel with a reference counter. The reference counter
@@ -32,7 +33,7 @@ import org.jgroups.Receiver;
*/
public class JChannelWrapper {
- private static final Logger logger = Logger.getLogger(JChannelWrapper.class);
+ private static final Logger logger = LoggerFactory.getLogger(JChannelWrapper.class);
private boolean connected = false;
int refCount = 1;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java
index f0f3aab07d..5f5d608ce5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java
@@ -21,7 +21,8 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jgroups.Receiver;
/**
@@ -30,7 +31,7 @@ import org.jgroups.Receiver;
*/
public class JGroupsReceiver implements Receiver {
- private static final Logger logger = Logger.getLogger(JGroupsReceiver.class);
+ private static final Logger logger = LoggerFactory.getLogger(JGroupsReceiver.class);
private final BlockingQueue<byte[]> dequeue = new LinkedBlockingDeque<>();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index e476dcb20a..5beb963958 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -16,565 +16,333 @@
*/
package org.apache.activemq.artemis.core.client;
+import java.net.UnknownHostException;
+
import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
import org.apache.activemq.artemis.api.core.Interceptor;
-import org.apache.activemq.artemis.core.protocol.core.Packet;
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.w3c.dom.Node;
-import java.net.UnknownHostException;
-
/**
* Logger Code 21
- * <p>
- * Each message id must be 6 digits long starting with 21, the 3rd digit donates the level so
- *
- * <pre>
- * INF0 1
- * WARN 2
- * DEBUG 3
- * ERROR 4
- * TRACE 5
- * FATAL 6
- * </pre>
- *
- * so an INFO message would be 211000 to 211999.
- * <p>
- * Once released, methods should not be deleted as they may be referenced by knowledge base
- * articles. Unused methods should be marked as deprecated.
*/
-@MessageLogger(projectCode = "AMQ")
-public interface ActiveMQClientLogger extends BasicLogger {
-
- /**
- * The default logger.
- */
- ActiveMQClientLogger LOGGER = Logger.getMessageLogger(ActiveMQClientLogger.class, ActiveMQClientLogger.class.getPackage().getName());
+@LogBundle(projectCode = "AMQ")
+public interface ActiveMQClientLogger {
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 211000, value = "**** Dumping session creation stacks ****", format = Message.Format.MESSAGE_FORMAT)
- void dumpingSessionStacks();
+ ActiveMQClientLogger LOGGER = CodeFactory.getCodeClass(ActiveMQClientLogger.class, ActiveMQClientLogger.class.getPackage().getName());
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 211001, value = "session created", format = Message.Format.MESSAGE_FORMAT)
- void dumpingSessionStack(@Cause Exception e);
-
- @LogMessage(level = Logger.Level.DEBUG)
- @Message(id = 211002, value = "Started {0} Netty Connector version {1} to {2}:{3,number,#}", format = Message.Format.MESSAGE_FORMAT)
- void startedNettyConnector(String connectorType, String version, String host, Integer port);
-
- @LogMessage(level = Logger.Level.DEBUG)
- @Message(id = 211003, value = "Started InVM Connector", format = Message.Format.MESSAGE_FORMAT)
- void startedInVMConnector();
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212000, value = "{0}", format = Message.Format.MESSAGE_FORMAT)
- void warn(String message);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212001, value = "Error on clearing messages", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212001, value = "Error on clearing messages", level = LogMessage.Level.WARN)
void errorClearingMessages(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212002, value = "Timed out waiting for handler to complete processing", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212002, value = "Timed out waiting for handler to complete processing", level = LogMessage.Level.WARN)
void timeOutWaitingForProcessing();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212003, value = "Unable to close session", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212003, value = "Unable to close session", level = LogMessage.Level.WARN)
void unableToCloseSession(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212004, value = "Failed to connect to server.", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212004, value = "Failed to connect to server.", level = LogMessage.Level.WARN)
void failedToConnectToServer();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212005, value = "Tried {0} times to connect. Now giving up on reconnecting it.", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212005, value = "Tried {0} times to connect. Now giving up on reconnecting it.", level = LogMessage.Level.WARN)
void failedToConnectToServer(Integer reconnectAttempts);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212007,
- value = "connector.create or connectorFactory.createConnector should never throw an exception, implementation is badly behaved, but we will deal with it anyway.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212007, value = "connector.create or connectorFactory.createConnector should never throw an exception, implementation is badly behaved, but we will deal with it anyway.", level = LogMessage.Level.WARN)
void createConnectorException(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212008,
- value = "I am closing a core ClientSessionFactory you left open. Please make sure you close all ClientSessionFactories explicitly " + "before letting them go out of scope! {0}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212008, value = "I am closing a core ClientSessionFactory you left open. Please make sure you close all ClientSessionFactories explicitly " + "before letting them go out of scope! {0}", level = LogMessage.Level.WARN)
void factoryLeftOpen(@Cause Exception e, int i);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212009, value = "resetting session after failure", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212009, value = "resetting session after failure", level = LogMessage.Level.WARN)
void resettingSessionAfterFailure();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212010, value = "Server is starting, retry to create the session {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212010, value = "Server is starting, retry to create the session {0}", level = LogMessage.Level.WARN)
void retryCreateSessionSeverStarting(String name);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212011, value = "committing transaction after failover occurred, any non persistent messages may be lost", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212011, value = "committing transaction after failover occurred, any non persistent messages may be lost", level = LogMessage.Level.WARN)
void commitAfterFailover();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212012, value = "failure occurred during commit throwing XAException", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212012, value = "failure occurred during commit throwing XAException", level = LogMessage.Level.WARN)
void failoverDuringCommit();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212014, value = "failover occurred during prepare rolling back", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212014, value = "failover occurred during prepare rolling back", level = LogMessage.Level.WARN)
void failoverDuringPrepareRollingBack();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212015, value = "failover occurred during prepare rolling back", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212015, value = "failover occurred during prepare rolling back", level = LogMessage.Level.WARN)
void errorDuringPrepare(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212016,
- value = "I am closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly before letting them go out of scope! {0}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212016, value = "I am closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly before letting them go out of scope! {0}", level = LogMessage.Level.WARN)
void clientSessionNotClosed(@Cause Exception e, int identity);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212017, value = "error adding packet", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212017, value = "error adding packet", level = LogMessage.Level.WARN)
void errorAddingPacket(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212018, value = "error calling cancel", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212018, value = "error calling cancel", level = LogMessage.Level.WARN)
void errorCallingCancel(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212019, value = "error reading index", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212019, value = "error reading index", level = LogMessage.Level.WARN)
void errorReadingIndex(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212020, value = "error setting index", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212020, value = "error setting index", level = LogMessage.Level.WARN)
void errorSettingIndex(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212021, value = "error resetting index", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212021, value = "error resetting index", level = LogMessage.Level.WARN)
void errorReSettingIndex(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212022, value = "error reading LargeMessage file cache", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212022, value = "error reading LargeMessage file cache", level = LogMessage.Level.WARN)
void errorReadingCache(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212023, value = "error closing LargeMessage file cache", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212023, value = "error closing LargeMessage file cache", level = LogMessage.Level.WARN)
void errorClosingCache(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212024, value = "Exception during finalization for LargeMessage file cache", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212024, value = "Exception during finalization for LargeMessage file cache", level = LogMessage.Level.WARN)
void errorFinalisingCache(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212025, value = "did not connect the cluster connection to other nodes", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212025, value = "did not connect the cluster connection to other nodes", level = LogMessage.Level.WARN)
void errorConnectingToNodes(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212026, value = "Timed out waiting for pool to terminate", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212026, value = "Timed out waiting for pool to terminate", level = LogMessage.Level.WARN)
void timedOutWaitingForTermination();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212027, value = "Timed out waiting for scheduled pool to terminate", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212027, value = "Timed out waiting for scheduled pool to terminate", level = LogMessage.Level.WARN)
void timedOutWaitingForScheduledPoolTermination();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212028, value = "error starting server locator", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212028, value = "error starting server locator", level = LogMessage.Level.WARN)
void errorStartingLocator(@Cause Exception e);
- @LogMessage(level = Logger.Level.DEBUG)
- @Message(id = 212029,
- value = "Closing a Server Locator left open. Please make sure you close all Server Locators explicitly before letting them go out of scope! {0}",
- format = Message.Format.MESSAGE_FORMAT)
- void serverLocatorNotClosed(@Cause Exception e, int identity);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212030, value = "error sending topology", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212030, value = "error sending topology", level = LogMessage.Level.WARN)
void errorSendingTopology(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212031, value = "error sending topology", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212031, value = "error sending topology", level = LogMessage.Level.WARN)
void errorSendingTopologyNodedown(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212032, value = "Timed out waiting to stop discovery thread", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212032, value = "Timed out waiting to stop discovery thread", level = LogMessage.Level.WARN)
void timedOutStoppingDiscovery();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212033, value = "unable to send notification when discovery group is stopped", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212033, value = "unable to send notification when discovery group is stopped", level = LogMessage.Level.WARN)
void errorSendingNotifOnDiscoveryStop(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212034,
- value = "There are more than one servers on the network broadcasting the same node id. " + "You will see this message exactly once (per node) if a node is restarted, in which case it can be safely " + "ignored. But if it is logged continuously it means you really do have more than one node on the same network " + "active concurrently with the same node id. This could occur if you have a backup node active at the same time as " + "its live node. nodeID={0}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212034, value = "There are more than one servers on the network broadcasting the same node id. " + "You will see this message exactly once (per node) if a node is restarted, in which case it can be safely " + "ignored. But if it is logged continuously it means you really do have more than one node on the same network " + "active concurrently with the same node id. This could occur if you have a backup node active at the same time as " + "its live node. nodeID={0}", le [...]
void multipleServersBroadcastingSameNode(String nodeId);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212035, value = "error receiving packet in discovery", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212035, value = "error receiving packet in discovery", level = LogMessage.Level.WARN)
void errorReceivingPacketInDiscovery(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212036,
- value = "Can not find packet to clear: {0} last received command id first stored command id {1}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212036, value = "Can not find packet to clear: {0} last received command id first stored command id {1}", level = LogMessage.Level.WARN)
void cannotFindPacketToClear(Integer lastReceivedCommandID, Integer firstStoredCommandID);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212037, value = "Connection failure to {0} has been detected: {1} [code={2}]", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212037, value = "Connection failure to {0} has been detected: {1} [code={2}]", level = LogMessage.Level.WARN)
void connectionFailureDetected(String remoteAddress, String message, ActiveMQExceptionType type);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212038, value = "Failure in calling interceptor: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212038, value = "Failure in calling interceptor: {0}", level = LogMessage.Level.WARN)
void errorCallingInterceptor(@Cause Throwable e, Interceptor interceptor);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212040, value = "Timed out waiting for netty ssl close future to complete", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212040, value = "Timed out waiting for netty ssl close future to complete", level = LogMessage.Level.WARN)
void timeoutClosingSSL();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212041, value = "Timed out waiting for netty channel to close", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212041, value = "Timed out waiting for netty channel to close", level = LogMessage.Level.WARN)
void timeoutClosingNettyChannel();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212042, value = "Timed out waiting for packet to be flushed", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212042, value = "Timed out waiting for packet to be flushed", level = LogMessage.Level.WARN)
void timeoutFlushingPacket();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212043, value = "Property {0} must be an Integer, it is {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212043, value = "Property {0} must be an Integer, it is {1}", level = LogMessage.Level.WARN)
void propertyNotInteger(String propName, String name);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212044, value = "Property {0} must be a Long, it is {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212044, value = "Property {0} must be a Long, it is {1}", level = LogMessage.Level.WARN)
void propertyNotLong(String propName, String name);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212045, value = "Property {0} must be a Boolean, it is {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212045, value = "Property {0} must be a Boolean, it is {1}", level = LogMessage.Level.WARN)
void propertyNotBoolean(String propName, String name);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212046, value = "Cannot find activemq-version.properties on classpath: {0}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212046, value = "Cannot find activemq-version.properties on classpath: {0}", level = LogMessage.Level.WARN)
void noVersionOnClasspath(String classpath);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212047, value = "Warning: JVM allocated more data what would make results invalid {0}:{1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212047, value = "Warning: JVM allocated more data what would make results invalid {0}:{1}", level = LogMessage.Level.WARN)
void jvmAllocatedMoreMemory(Long totalMemory1, Long totalMemory2);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212048, value = "Random address ({0}) was already in use, trying another time",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212048, value = "Random address ({0}) was already in use, trying another time", level = LogMessage.Level.WARN)
void broadcastGroupBindErrorRetry(String hostAndPort, @Cause Throwable t);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212049,
- value = "Could not bind to {0} ({1} address); " +
- "make sure your discovery group-address is of the same type as the IP stack (IPv4 or IPv6)." +
- "\nIgnoring discovery group-address, but this may lead to cross talking.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212049, value = "Could not bind to {0} ({1} address); " + "make sure your discovery group-address is of the same type as the IP stack (IPv4 or IPv6)." + "\nIgnoring discovery group-address, but this may lead to cross talking.", level = LogMessage.Level.WARN)
void ioDiscoveryError(String hostAddress, String s);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212050, value = "Compressed large message tried to read {0} bytes from stream {1}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212050, value = "Compressed large message tried to read {0} bytes from stream {1}", level = LogMessage.Level.WARN)
void compressedLargeMessageError(int length, int nReadBytes);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212051,
- value = "Invalid concurrent session usage. Sessions are not supposed to be used by more than one thread concurrently.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212051, value = "Invalid concurrent session usage. Sessions are not supposed to be used by more than one thread concurrently.", level = LogMessage.Level.WARN)
void invalidConcurrentSessionUsage(@Cause Throwable t);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212052,
- value = "Packet {0} was answered out of sequence due to a previous server timeout and it''s being ignored",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212052, value = "Packet {0} was answered out of sequence due to a previous server timeout and it''s being ignored", level = LogMessage.Level.WARN)
void packetOutOfOrder(Object obj, @Cause Throwable t);
/**
* Warns about usage of {@link org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler} or JMS's {@code CompletionWindow} with
* confirmations disabled (confirmationWindowSize=-1).
*/
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212053,
- value = "CompletionListener/SendAcknowledgementHandler used with confirmationWindowSize=-1. Enable confirmationWindowSize to receive acks from server!",
- format = Message.Format.MESSAGE_FORMAT)
+
+ @LogMessage(id = 212053, value = "CompletionListener/SendAcknowledgementHandler used with confirmationWindowSize=-1. Enable confirmationWindowSize to receive acks from server!", level = LogMessage.Level.WARN)
void confirmationWindowDisabledWarning();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212054,
- value = "Destination address={0} is blocked. If the system is configured to block make sure you consume messages on this configuration.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212054, value = "Destination address={0} is blocked. If the system is configured to block make sure you consume messages on this configuration.", level = LogMessage.Level.WARN)
void outOfCreditOnFlowControl(String address);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212055, value = "Unable to close consumer", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212055, value = "Unable to close consumer", level = LogMessage.Level.WARN)
void unableToCloseConsumer(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212056, value = "local-bind-address specified for broadcast group but no local-bind-port. Using random port for UDP Broadcast ({0})",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212056, value = "local-bind-address specified for broadcast group but no local-bind-port. Using random port for UDP Broadcast ({0})", level = LogMessage.Level.WARN)
void broadcastGroupBindError(String hostAndPort);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212057, value = "Large Message Streaming is taking too long to flush on back pressure.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212057, value = "Large Message Streaming is taking too long to flush on back pressure.", level = LogMessage.Level.WARN)
void timeoutStreamingLargeMessage();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212058, value = "Unable to get a message.",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212058, value = "Unable to get a message.", level = LogMessage.Level.WARN)
void unableToGetMessage(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212059, value = "Failed to clean up: {0} ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212059, value = "Failed to clean up: {0} ", level = LogMessage.Level.WARN)
void failedCleaningUp(String target);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212060, value = "Unexpected null data received from DiscoveryEndpoint ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212060, value = "Unexpected null data received from DiscoveryEndpoint ", level = LogMessage.Level.WARN)
void unexpectedNullDataReceived();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212061, value = "Failed to perform force close ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212061, value = "Failed to perform force close ", level = LogMessage.Level.WARN)
void failedForceClose(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212062, value = "Failed to perform post actions on message processing ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212062, value = "Failed to perform post actions on message processing ", level = LogMessage.Level.WARN)
void failedPerformPostActionsOnMessage(@Cause Exception e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212063, value = "Unable to handle connection failure ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212063, value = "Unable to handle connection failure ", level = LogMessage.Level.WARN)
void unableToHandleConnectionFailure(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212064, value = "Unable to receive cluster topology ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212064, value = "Unable to receive cluster topology ", level = LogMessage.Level.WARN)
void unableToReceiveClusterTopology(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212065, value = "{0} getting exception when receiving broadcasting ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212065, value = "{0} getting exception when receiving broadcasting ", level = LogMessage.Level.WARN)
void unableToReceiveBroadcast(@Cause Exception e, String target);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212066, value = "failed to parse int property ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212066, value = "failed to parse int property ", level = LogMessage.Level.WARN)
void unableToParseValue(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212067, value = "failed to get system property ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212067, value = "failed to get system property ", level = LogMessage.Level.WARN)
void unableToGetProperty(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212068, value = "Couldn't finish the client globalThreadPool in less than 10 seconds, interrupting it now ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212068, value = "Couldn't finish the client globalThreadPool in less than 10 seconds, interrupting it now ", level = LogMessage.Level.WARN)
void unableToProcessGlobalThreadPoolIn10Sec();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212069, value = "Couldn't finish the client scheduled in less than 10 seconds, interrupting it now ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212069, value = "Couldn't finish the client scheduled in less than 10 seconds, interrupting it now ", level = LogMessage.Level.WARN)
void unableToProcessScheduledlIn10Sec();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212070, value = "Unable to initialize VersionLoader ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212070, value = "Unable to initialize VersionLoader ", level = LogMessage.Level.WARN)
void unableToInitVersionLoader(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212071, value = "Unable to check Epoll availability ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212071, value = "Unable to check Epoll availability ", level = LogMessage.Level.WARN)
void unableToCheckEpollAvailability(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212072, value = "Failed to change channel state to ReadyForWriting ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212072, value = "Failed to change channel state to ReadyForWriting ", level = LogMessage.Level.WARN)
void failedToSetChannelReadyForWriting(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212073, value = "Unable to check KQueue availability ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212073, value = "Unable to check KQueue availability ", level = LogMessage.Level.WARN)
void unableToCheckKQueueAvailability(@Cause Throwable e);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212074, value = "SendAcknowledgementHandler will not be asynchronous without setting up confirmation window size",
- format = Message.Format.MESSAGE_FORMAT)
- void confirmationNotSet();
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212075, value = "KQueue is not available, please add to the classpath or configure useKQueue=false to remove this warning",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212075, value = "KQueue is not available, please add to the classpath or configure useKQueue=false to remove this warning", level = LogMessage.Level.WARN)
void unableToCheckKQueueAvailabilityNoClass();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212076, value = "Epoll is not available, please add to the classpath or configure useEpoll=false to remove this warning",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212076, value = "Epoll is not available, please add to the classpath or configure useEpoll=false to remove this warning", level = LogMessage.Level.WARN)
void unableToCheckEpollAvailabilitynoClass();
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212077, value = "Timed out waiting to receive initial broadcast from cluster. Retry {0} of {1}",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212077, value = "Timed out waiting to receive initial broadcast from cluster. Retry {0} of {1}", level = LogMessage.Level.WARN)
void broadcastTimeout(int retry, int maxretry);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212079, value = "The upstream connector from the downstream federation will ignore url parameter {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212079, value = "The upstream connector from the downstream federation will ignore url parameter {0}", level = LogMessage.Level.WARN)
void ignoredParameterForDownstreamFederation(String name);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 212080, value = "Using legacy SSL store provider value: {0}. Please use either ''keyStoreType'' or ''trustStoreType'' instead as appropriate.", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 212080, value = "Using legacy SSL store provider value: {0}. Please use either ''keyStoreType'' or ''trustStoreType'' instead as appropriate.", level = LogMessage.Level.WARN)
void oldStoreProvider(String value);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214000, value = "Failed to call onMessage", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214000, value = "Failed to call onMessage", level = LogMessage.Level.ERROR)
void onMessageError(@Cause Throwable e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214001, value = "failed to cleanup session", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214001, value = "failed to cleanup session", level = LogMessage.Level.ERROR)
void failedToCleanupSession(@Cause Exception e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214002, value = "Failed to execute failure listener", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214002, value = "Failed to execute failure listener", level = LogMessage.Level.ERROR)
void failedToExecuteListener(@Cause Throwable t);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214003, value = "Failed to handle failover", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214003, value = "Failed to handle failover", level = LogMessage.Level.ERROR)
void failedToHandleFailover(@Cause Throwable t);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214004, value = "XA end operation failed ", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214004, value = "XA end operation failed ", level = LogMessage.Level.ERROR)
void errorCallingEnd(@Cause Throwable t);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214005, value = "XA start operation failed {0} code:{1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214005, value = "XA start operation failed {0} code:{1}", level = LogMessage.Level.ERROR)
void errorCallingStart(String message, Integer code);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214006, value = "Session is not XA", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214006, value = "Session is not XA", level = LogMessage.Level.ERROR)
void sessionNotXA();
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214007, value = "Received exception asynchronously from server", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214007, value = "Received exception asynchronously from server", level = LogMessage.Level.ERROR)
void receivedExceptionAsynchronously(@Cause Exception e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214008, value = "Failed to handle packet", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214008, value = "Failed to handle packet", level = LogMessage.Level.ERROR)
void failedToHandlePacket(@Cause Exception e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214009, value = "Failed to stop discovery group", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214009, value = "Failed to stop discovery group", level = LogMessage.Level.ERROR)
void failedToStopDiscovery(@Cause Throwable e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214010, value = "Failed to receive datagram", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214010, value = "Failed to receive datagram", level = LogMessage.Level.ERROR)
void failedToReceiveDatagramInDiscovery(@Cause Throwable e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214011, value = "Failed to call discovery listener", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214011, value = "Failed to call discovery listener", level = LogMessage.Level.ERROR)
void failedToCallListenerInDiscovery(@Cause Throwable e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214012, value = "Unexpected error handling packet {0}", format = Message.Format.MESSAGE_FORMAT)
- void errorHandlingPacket(@Cause Throwable t, Packet packet);
-
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214013, value = "Failed to decode packet", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214013, value = "Failed to decode packet", level = LogMessage.Level.ERROR)
void errorDecodingPacket(@Cause Throwable e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214014, value = "Failed to execute failure listener", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214014, value = "Failed to execute failure listener", level = LogMessage.Level.ERROR)
void errorCallingFailureListener(@Cause Throwable e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214015, value = "Failed to execute connection life cycle listener", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214015, value = "Failed to execute connection life cycle listener", level = LogMessage.Level.ERROR)
void errorCallingLifeCycleListener(@Cause Throwable e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214016, value = "Failed to create netty connection", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214016, value = "Failed to create netty connection", level = LogMessage.Level.ERROR)
void errorCreatingNettyConnection(@Cause Throwable e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214017, value = "Caught unexpected Throwable", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214017, value = "Caught unexpected Throwable", level = LogMessage.Level.ERROR)
void caughtunexpectedThrowable(@Cause Throwable t);
- @Deprecated
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214018, value = "Failed to invoke getTextContent() on node {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214018, value = "Failed to invoke getTextContent() on node {0}", level = LogMessage.Level.ERROR)
void errorOnXMLTransform(@Cause Throwable t, Node n);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214019, value = "Invalid configuration", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214019, value = "Invalid configuration", level = LogMessage.Level.ERROR)
void errorOnXMLTransformInvalidConf(@Cause Throwable t);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214020, value = "Exception happened while stopping Discovery BroadcastEndpoint {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214020, value = "Exception happened while stopping Discovery BroadcastEndpoint {0}", level = LogMessage.Level.ERROR)
void errorStoppingDiscoveryBroadcastEndpoint(Object endpoint, @Cause Throwable t);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214021, value = "Invalid cipher suite specified. Supported cipher suites are: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214021, value = "Invalid cipher suite specified. Supported cipher suites are: {0}", level = LogMessage.Level.ERROR)
void invalidCipherSuite(String validSuites);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214022, value = "Invalid protocol specified. Supported protocols are: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214022, value = "Invalid protocol specified. Supported protocols are: {0}", level = LogMessage.Level.ERROR)
void invalidProtocol(String validProtocols);
- @LogMessage(level = Logger.Level.DEBUG)
- @Message(id = 214023, value = "HTTP Handshake failed, received %s")
- void httpHandshakeFailed(Object msg);
-
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214024, value = "HTTP upgrade not supported by remote acceptor")
- void httpUpgradeNotSupportedByRemoteAcceptor();
-
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214025, value = "Invalid type {0}, Using default connection factory at {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214025, value = "Invalid type {0}, Using default connection factory at {1}", level = LogMessage.Level.ERROR)
void invalidCFType(String type, String uri);
- @LogMessage(level = Logger.Level.TRACE)
- @Message(id = 214026,
- value = "Failure captured on connectionID={0}, performing failover or reconnection now",
- format = Message.Format.MESSAGE_FORMAT)
- void failoverOrReconnect(Object connectionID, @Cause Throwable cause);
-
- @LogMessage(level = Logger.Level.DEBUG)
- @Message(id = 214027,
- value = "Replaying commands for channelID={0} with lastCommandID from the server={1}",
- format = Message.Format.MESSAGE_FORMAT)
- void replayingCommands(Object connectionID, int lastConfirmedCommandID);
-
- @LogMessage(level = Logger.Level.DEBUG)
- @Message(id = 214028,
- value = "Couldn't reattach session {0}, performing as a failover operation now and recreating objects",
- format = Message.Format.MESSAGE_FORMAT)
- void reconnectCreatingNewSession(long id);
-
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214029, value = "Unexpected response from HTTP server: %s")
+ @LogMessage(id = 214029, value = "Unexpected response from HTTP server: %s", level = LogMessage.Level.ERROR)
void unexpectedResponseFromHttpServer(Object response);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214030, value = "Failed to bind {0}={1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214030, value = "Failed to bind {0}={1}", level = LogMessage.Level.ERROR)
void failedToBind(String p1, String p2, @Cause Throwable cause);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214031, value = "Failed to decode buffer, disconnect immediately.", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214031, value = "Failed to decode buffer, disconnect immediately.", level = LogMessage.Level.ERROR)
void disconnectOnErrorDecoding(@Cause Throwable cause);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214032, value = "Unable to initialize VersionLoader ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214032, value = "Unable to initialize VersionLoader ", level = LogMessage.Level.ERROR)
void unableToInitVersionLoaderError(@Cause Throwable e);
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 214033, value = "Cannot resolve host ",
- format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 214033, value = "Cannot resolve host ", level = LogMessage.Level.ERROR)
void unableToResolveHost(@Cause UnknownHostException e);
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
index 15194db21a..219c184de4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
@@ -32,11 +32,11 @@ import org.apache.activemq.artemis.api.core.ActiveMQTransactionOutcomeUnknownExc
import org.apache.activemq.artemis.api.core.ActiveMQTransactionRolledBackException;
import org.apache.activemq.artemis.api.core.ActiveMQUnBlockedException;
import org.apache.activemq.artemis.core.cluster.DiscoveryGroup;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.Message;
import org.apache.activemq.artemis.spi.core.remoting.Connection;
-import org.jboss.logging.Messages;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageBundle;
import org.w3c.dom.Node;
/**
@@ -46,10 +46,10 @@ import org.w3c.dom.Node;
*
* so 219000 to 219999
*/
-@MessageBundle(projectCode = "AMQ")
+@LogBundle(projectCode = "AMQ")
public interface ActiveMQClientMessageBundle {
- ActiveMQClientMessageBundle BUNDLE = Messages.getBundle(ActiveMQClientMessageBundle.class);
+ ActiveMQClientMessageBundle BUNDLE = CodeFactory.getCodeClass(ActiveMQClientMessageBundle.class);
@Message(id = 219000, value = "ClientSession closed while creating session")
ActiveMQInternalErrorException clientSessionClosed();
@@ -81,16 +81,16 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219010, value = "Connection is destroyed")
ActiveMQNotConnectedException connectionDestroyed();
- @Message(id = 219011, value = "Did not receive data from server for {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219011, value = "Did not receive data from server for {0}")
ActiveMQConnectionTimedOutException connectionTimedOut(Connection transportConnection);
@Message(id = 219012, value = "Timed out waiting to receive initial broadcast from cluster")
ActiveMQConnectionTimedOutException connectionTimedOutInInitialBroadcast();
- @Message(id = 219013, value = "Timed out waiting to receive cluster topology. Group:{0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219013, value = "Timed out waiting to receive cluster topology. Group:{0}")
ActiveMQConnectionTimedOutException connectionTimedOutOnReceiveTopology(DiscoveryGroup discoveryGroup);
- @Message(id = 219014, value = "Timed out after waiting {0} ms for response when sending packet {1}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219014, value = "Timed out after waiting {0} ms for response when sending packet {1}")
ActiveMQConnectionTimedOutException timedOutSendingPacket(long timeout, Byte type);
@Message(id = 219015, value = "The connection was disconnected because of server shutdown")
@@ -114,8 +114,7 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219021, value = "Cannot set MessageHandler - consumer is in receive(...)")
ActiveMQIllegalStateException inReceive();
- @Message(id = 219022, value = "Header size ({0}) is too big, use the messageBody for large data, or increase minLargeMessageSize",
- format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219022, value = "Header size ({0}) is too big, use the messageBody for large data, or increase minLargeMessageSize")
ActiveMQIllegalStateException headerSizeTooBig(Integer headerSize);
@Message(id = 219023, value = "The large message lost connection with its session, either because of a rollback or a closed session")
@@ -145,23 +144,22 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219031, value = "The transaction was rolled back on failover however commit may have been successful")
ActiveMQTransactionOutcomeUnknownException txOutcomeUnknown();
- @Message(id = 219032, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219032, value = "Invalid type: {0}")
IllegalArgumentException invalidType(Object type);
- @Message(id = 219033, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219033, value = "Invalid type: {0}")
IllegalArgumentException invalidEncodeType(Object type);
- @Message(id = 219034, value = "Params for management operations must be of the following type: int long double String boolean Map or array thereof but found {0}",
- format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219034, value = "Params for management operations must be of the following type: int long double String boolean Map or array thereof but found {0}")
IllegalArgumentException invalidManagementParam(Object type);
- @Message(id = 219035, value = "Invalid window size {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219035, value = "Invalid window size {0}")
IllegalArgumentException invalidWindowSize(Integer size);
- @Message(id = 219037, value = "Invalid last Received Command ID: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219037, value = "Invalid last Received Command ID: {0}")
IllegalArgumentException invalidCommandID(Integer lastReceivedCommandID);
- @Message(id = 219038, value = "Cannot find channel with id {0} to close", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219038, value = "Cannot find channel with id {0} to close")
IllegalArgumentException noChannelToClose(Long id);
@Message(id = 219039, value = "Close Listener cannot be null")
@@ -170,7 +168,7 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219040, value = "Fail Listener cannot be null")
IllegalArgumentException failListenerCannotBeNull();
- @Message(id = 219041, value = "Connection already exists with id {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219041, value = "Connection already exists with id {0}")
IllegalArgumentException connectionExists(Object id);
@Message(id = 219042, value = "Invalid argument null listener")
@@ -191,7 +189,7 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219048, value = "nodes have a different number of attributes")
IllegalArgumentException nodeHaveDifferentAttNumber();
- @Message(id = 219049, value = "attribute {0}={1} does not match", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219049, value = "attribute {0}={1} does not match")
IllegalArgumentException attsDontMatch(String name, String value);
@Message(id = 219050, value = "one node has children and the other does not")
@@ -200,25 +198,25 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219051, value = "nodes have a different number of children")
IllegalArgumentException nodeHasDifferentChildNumber();
- @Message(id = 219052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean")
IllegalArgumentException mustBeBoolean(Node elem, String value);
- @Message(id = 219053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double")
IllegalArgumentException mustBeDouble(Node elem, String value);
- @Message(id = 219054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as an Integer", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as an Integer")
IllegalArgumentException mustBeInteger(Node elem, String value);
- @Message(id = 219055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long")
IllegalArgumentException mustBeLong(Node element, String value);
@Message(id = 219057, value = "Error decoding password")
IllegalArgumentException errordecodingPassword(@Cause Exception e);
- @Message(id = 219058, value = "Address \"{0}\" is full. Message encode size = {1}B", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219058, value = "Address \"{0}\" is full. Message encode size = {1}B")
ActiveMQAddressFullException addressIsFull(String addressName, int size);
- @Message(id = 219059, value = "Interceptor {0} rejected packet in a blocking call. This call will never complete.", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219059, value = "Interceptor {0} rejected packet in a blocking call. This call will never complete.")
ActiveMQInterceptorRejectedPacketException interceptorRejectedPacket(String interceptionResult);
@Message(id = 219060, value = "Large Message Transmission interrupted on consumer shutdown.")
@@ -233,7 +231,7 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219063, value = "Cannot send a packet while response cache is full.")
IllegalStateException cannotSendPacketWhilstResponseCacheFull();
- @Message(id = 219064, value = "Invalide packet: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219064, value = "Invalide packet: {0}")
IllegalStateException invalidPacket(byte type);
@Message(id = 219065, value = "Failed to handle packet.")
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
index 9936290ce5..87c8281322 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
@@ -45,12 +45,13 @@ import org.apache.activemq.artemis.utils.TokenBucketLimiter;
import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
import org.apache.activemq.artemis.utils.collections.PriorityLinkedList;
import org.apache.activemq.artemis.utils.collections.PriorityLinkedListImpl;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class ClientConsumerImpl implements ClientConsumerInternal {
- private static final Logger logger = Logger.getLogger(ClientConsumerImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(ClientConsumerImpl.class);
private static final long CLOSE_TIMEOUT_MILLISECONDS = 10000;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
index 59e29c390c..9d746fc19c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
@@ -33,14 +33,15 @@ import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream;
import org.apache.activemq.artemis.utils.DeflaterReader;
import org.apache.activemq.artemis.utils.TokenBucketLimiter;
import org.apache.activemq.artemis.utils.UUIDGenerator;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The client-side Producer.
*/
public class ClientProducerImpl implements ClientProducerInternal {
- private static final Logger logger = Logger.getLogger(ClientProducerImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(ClientProducerImpl.class);
private final SimpleString address;
@@ -282,7 +283,7 @@ public class ClientProducerImpl implements ClientProducerInternal {
// Not the continuations, but this is ok since we are only interested in limiting the amount of
// data in *memory* and continuations go straight to the disk
- logger.tracef("sendRegularMessage::%s, Blocking=%s", msgI, sendBlocking);
+ logger.trace("sendRegularMessage::{}, Blocking={}", msgI, sendBlocking);
int creditSize = sessionContext.getCreditsOnSendingFull(msgI);
@@ -308,7 +309,7 @@ public class ClientProducerImpl implements ClientProducerInternal {
final ICoreMessage msgI,
final ClientProducerCredits credits,
SendAcknowledgementHandler handler) throws ActiveMQException {
- logger.tracef("largeMessageSend::%s, Blocking=%s", msgI, sendBlocking);
+ logger.trace("largeMessageSend::{}, Blocking={}", msgI, sendBlocking);
int headerSize = msgI.getHeadersAndPropertiesEncodeSize();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
index a8c81e5258..b091c039e6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
@@ -70,11 +70,12 @@ import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.apache.activemq.artemis.utils.UUIDGenerator;
import org.apache.activemq.artemis.utils.actors.OrderedExecutorFactory;
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, ClientConnectionLifeCycleListener {
- private static final Logger logger = Logger.getLogger(ClientSessionFactoryImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(ClientSessionFactoryImpl.class);
private final ServerLocatorInternal serverLocator;
@@ -555,7 +556,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
private void failoverOrReconnect(final Object connectionID,
final ActiveMQException me,
String scaleDownTargetNodeID) {
- ActiveMQClientLogger.LOGGER.failoverOrReconnect(connectionID, me);
+ logger.debug("Failure captured on connectionID={0}, performing failover or reconnection now", connectionID, me);
for (ClientSessionInternal session : sessions) {
SessionContext context = session.getSessionContext();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index fc90c7c9c8..fa65b2e003 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -58,11 +58,12 @@ import org.apache.activemq.artemis.utils.ConfirmationWindowWarning;
import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
import org.apache.activemq.artemis.utils.UUIDGenerator;
import org.apache.activemq.artemis.utils.XidCodecSupport;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class ClientSessionImpl implements ClientSessionInternal, FailureListener {
- private static final Logger logger = Logger.getLogger(ClientSessionImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(ClientSessionImpl.class);
private final Map<String, String> metadata = new HashMap<>();
@@ -1526,7 +1527,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
@Override
public void setAddress(final Message message, final SimpleString address) {
- logger.tracef("setAddress() Setting default address as %s", address);
+ logger.trace("setAddress() Setting default address as {}", address);
message.setAddress(address);
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index 17707780fd..4554357252 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -73,7 +73,8 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
import org.apache.activemq.artemis.utils.actors.Actor;
import org.apache.activemq.artemis.utils.actors.OrderedExecutor;
import org.apache.activemq.artemis.utils.uri.FluentPropertyBeanIntrospectorWithIgnores;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is the implementation of {@link org.apache.activemq.artemis.api.core.client.ServerLocator} and all
@@ -81,7 +82,7 @@ import org.jboss.logging.Logger;
*/
public final class ServerLocatorImpl implements ServerLocatorInternal, DiscoveryListener {
- private static final Logger logger = Logger.getLogger(ServerLocatorImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(ServerLocatorImpl.class);
private enum STATE {
INITIALIZED, CLOSED, CLOSING
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
index 749f167b98..1255b4b07c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
@@ -31,11 +31,12 @@ import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener;
import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.spi.core.remoting.Connector;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class Topology {
- private static final Logger logger = Logger.getLogger(Topology.class);
+ private static final Logger logger = LoggerFactory.getLogger(Topology.class);
private final Set<ClusterTopologyListener> topologyListeners;
@@ -204,7 +205,7 @@ public final class Topology {
}
if (manager != null && !manager.updateMember(uniqueEventID, nodeId, memberInput)) {
- logger.debugf("TopologyManager rejected the update towards %s", memberInput);
+ logger.debug("TopologyManager rejected the update towards {}", memberInput);
return false;
}
@@ -312,7 +313,7 @@ public final class Topology {
if (manager != null && !manager.removeMember(uniqueEventID, nodeId)) {
- logger.debugf("TopologyManager rejected the update towards %s", nodeId);
+ logger.debug("TopologyManager rejected the update towards {}", nodeId);
return false;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java
index 45bd213b24..45d3f97b01 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java
@@ -40,7 +40,8 @@ import org.apache.activemq.artemis.core.server.management.Notification;
import org.apache.activemq.artemis.core.server.management.NotificationService;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.apache.activemq.artemis.utils.collections.TypedProperties;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class is used to search for members on the cluster through the opaque interface {@link BroadcastEndpoint}.
@@ -52,7 +53,7 @@ import org.jboss.logging.Logger;
*/
public final class DiscoveryGroup implements ActiveMQComponent {
- private static final Logger logger = Logger.getLogger(DiscoveryGroup.class);
+ private static final Logger logger = LoggerFactory.getLogger(DiscoveryGroup.class);
private final List<DiscoveryListener> listeners = new ArrayList<>();
@@ -360,7 +361,7 @@ public final class DiscoveryGroup implements ActiveMQComponent {
if (logger.isTraceEnabled()) {
logger.trace("Connectors changed on Discovery:");
for (DiscoveryEntry connector : connectors.values()) {
- logger.trace(connector);
+ logger.trace("{}", connector);
}
}
if (logger.isDebugEnabled()) {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
index 4b4a2cff9d..f4b35526fd 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -58,7 +58,8 @@ import org.apache.activemq.artemis.reader.MessageUtil;
import org.apache.activemq.artemis.utils.DataConstants;
import org.apache.activemq.artemis.utils.UUID;
import org.apache.activemq.artemis.utils.collections.TypedProperties;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.activemq.artemis.utils.ByteUtil.ensureExactWritable;
@@ -70,7 +71,7 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
protected volatile int memoryEstimate = -1;
- private static final Logger logger = Logger.getLogger(CoreMessage.class);
+ private static final Logger logger = LoggerFactory.getLogger(CoreMessage.class);
// There's an integer with the number of bytes for the body
public static final int BODY_OFFSET = DataConstants.SIZE_INT;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
index ca139be68a..33a9efb17f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
@@ -34,11 +34,12 @@ import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.JsonUtil;
import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.api.core.SimpleString;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageOpenTypeFactory<M extends Message> {
- private static final Logger logger = Logger.getLogger(MessageOpenTypeFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(MessageOpenTypeFactory.class);
public MessageOpenTypeFactory() {
try {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
index 0d0cb0d286..0f503f95b2 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
@@ -63,7 +63,8 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler;
import org.apache.activemq.artemis.utils.VersionLoader;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class will return specific packets for different types of actions happening on a messaging protocol.
@@ -79,7 +80,7 @@ import org.jboss.logging.Logger;
public class ActiveMQClientProtocolManager implements ClientProtocolManager {
- private static final Logger logger = Logger.getLogger(ActiveMQClientProtocolManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(ActiveMQClientProtocolManager.class);
private static final String handshake = "ARTEMIS";
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index 6013266ae2..fa20909ab1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -129,11 +129,12 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ActiveMQSessionContext extends SessionContext {
- private static final Logger logger = Logger.getLogger(ActiveMQSessionContext.class);
+ private static final Logger logger = LoggerFactory.getLogger(ActiveMQSessionContext.class);
private final Channel sessionChannel;
private final int serverVersion;
@@ -846,14 +847,14 @@ public class ActiveMQSessionContext extends SessionContext {
ReattachSessionResponseMessage response = (ReattachSessionResponseMessage) channel1.sendBlocking(request, PacketImpl.REATTACH_SESSION_RESP);
if (response.isReattached()) {
- ActiveMQClientLogger.LOGGER.replayingCommands(sessionChannel.getID(), response.getLastConfirmedCommandID());
+ logger.debug("Replaying commands for channelID={} with lastCommandID from the server={}", sessionChannel.getID(), response.getLastConfirmedCommandID());
// The session was found on the server - we reattached transparently ok
sessionChannel.replayCommands(response.getLastConfirmedCommandID());
return true;
} else {
- ActiveMQClientLogger.LOGGER.reconnectCreatingNewSession(sessionChannel.getID());
+ logger.debug("Couldn't reattach session {}, performing as a failover operation now and recreating objects", sessionChannel.getID());
sessionChannel.clearCommands();
@@ -1061,8 +1062,8 @@ public class ActiveMQSessionContext extends SessionContext {
final long elapsedMillis = TimeUnit.NANOSECONDS.toMillis(elapsedFlowControl);
ActiveMQClientLogger.LOGGER.timeoutStreamingLargeMessage();
if (logger.isDebugEnabled()) {
- logger.debugf("try to write %d bytes after blocked %d ms on a not writable connection: [%s]",
- chunkPacket.expectedEncodeSize(), elapsedMillis, connection.getID());
+ logger.debug("try to write {} bytes after blocked {} ms on a not writable connection: [{}]",
+ chunkPacket.expectedEncodeSize(), elapsedMillis, connection.getID());
}
}
if (requiresResponse) {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
index e0bb33b205..02b7ebc093 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
@@ -42,11 +42,12 @@ import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ActiveMQEx
import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.PacketsConfirmedMessage;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.utils.ConcurrentUtil;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class ChannelImpl implements Channel {
- private static final Logger logger = Logger.getLogger(ChannelImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(ChannelImpl.class);
public enum CHANNEL_ID {
/**
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
index 09607321a0..acb95fa32a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
@@ -46,11 +46,12 @@ import org.apache.activemq.artemis.core.security.ActiveMQPrincipal;
import org.apache.activemq.artemis.spi.core.protocol.AbstractRemotingConnection;
import org.apache.activemq.artemis.spi.core.remoting.Connection;
import org.apache.activemq.artemis.utils.SimpleIDGenerator;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RemotingConnectionImpl extends AbstractRemotingConnection implements CoreRemotingConnection {
- private static final Logger logger = Logger.getLogger(RemotingConnectionImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(RemotingConnectionImpl.class);
private final PacketDecoder packetDecoder;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java
index 00fd0fdb41..a066b06658 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java
@@ -30,11 +30,12 @@ import io.netty.handler.ssl.SslHandler;
import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.spi.core.remoting.Connection;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CertificateUtil {
- private static final Logger logger = Logger.getLogger(CertificateUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(CertificateUtil.class);
private static final String SSL_HANDLER_NAME = "ssl";
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java
index c29b17c70e..682af3c89b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java
@@ -21,7 +21,8 @@ import io.netty.channel.epoll.Epoll;
import io.netty.channel.kqueue.KQueue;
import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
import org.apache.activemq.artemis.utils.Env;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class will check for Epoll or KQueue is available, and return false in case of NoClassDefFoundError
@@ -29,7 +30,7 @@ import org.jboss.logging.Logger;
*/
public class CheckDependencies {
- private static final Logger logger = Logger.getLogger(CheckDependencies.class);
+ private static final Logger logger = LoggerFactory.getLogger(CheckDependencies.class);
public static final boolean isEpollAvailable() {
try {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
index a0a0476c6d..65ac5bdabd 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
@@ -43,13 +43,14 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
import org.apache.activemq.artemis.utils.Env;
import org.apache.activemq.artemis.utils.IPV6Util;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
public class NettyConnection implements Connection {
- private static final Logger logger = Logger.getLogger(NettyConnection.class);
+ private static final Logger logger = LoggerFactory.getLogger(NettyConnection.class);
private static final int DEFAULT_WAIT_MILLIS = 10_000;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 0514411fb5..f631231f27 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -123,7 +123,8 @@ import org.apache.activemq.artemis.spi.core.remoting.ssl.SSLContextFactoryProvid
import org.apache.activemq.artemis.utils.ConfigurationHelper;
import org.apache.activemq.artemis.utils.FutureLatch;
import org.apache.activemq.artemis.utils.IPV6Util;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.activemq.artemis.utils.Base64.encodeBytes;
@@ -133,7 +134,7 @@ public class NettyConnector extends AbstractConnector {
public static String EPOLL_CONNECTOR_TYPE = "EPOLL";
public static String KQUEUE_CONNECTOR_TYPE = "KQUEUE";
- private static final Logger logger = Logger.getLogger(NettyConnector.class);
+ private static final Logger logger = LoggerFactory.getLogger(NettyConnector.class);
public static final String JAVAX_KEYSTORE_PATH_PROP_NAME = "javax.net.ssl.keyStore";
public static final String JAVAX_KEYSTORE_PASSWORD_PROP_NAME = "javax.net.ssl.keyStorePassword";
@@ -730,7 +731,7 @@ public class NettyConnector extends AbstractConnector {
if (handler != null) {
pipeline.addLast(new ActiveMQClientChannelHandler(channelGroup, handler, new Listener(), closeExecutor));
- logger.debugf("Added ActiveMQClientChannelHandler to Channel with id = %s ", channel.id());
+ logger.debug("Added ActiveMQClientChannelHandler to Channel with id = {} ", channel.id());
}
}
});
@@ -740,7 +741,7 @@ public class NettyConnector extends AbstractConnector {
batchFlusherFuture = scheduledThreadPool.scheduleWithFixedDelay(flusher, batchDelay, batchDelay, TimeUnit.MILLISECONDS);
}
- ActiveMQClientLogger.LOGGER.startedNettyConnector(connectorType, TransportConstants.NETTY_VERSION, host, port);
+ logger.debug("Started {0} Netty Connector version {1} to {2}:{3,number,#}", connectorType, TransportConstants.NETTY_VERSION, host, port);
}
private SSLEngine loadJdkSslEngine(final SSLContextConfig sslContextConfig) throws Exception {
@@ -917,7 +918,7 @@ public class NettyConnector extends AbstractConnector {
request.headers().set(SEC_ACTIVEMQ_REMOTING_KEY, key);
ch.attr(REMOTING_KEY).set(key);
- logger.debugf("Sending HTTP request %s", request);
+ logger.debug("Sending HTTP request {}", request);
// Send the HTTP request.
ch.writeAndFlush(request);
@@ -1016,7 +1017,7 @@ public class NettyConnector extends AbstractConnector {
handshakeComplete = true;
} else {
// HTTP upgrade failed
- ActiveMQClientLogger.LOGGER.httpHandshakeFailed(msg);
+ logger.debug("HTTP Handshake failed, received {}", msg);
ctx.close();
latch.countDown();
}
@@ -1030,7 +1031,7 @@ public class NettyConnector extends AbstractConnector {
channelHandler.active = true;
}
if (!handshakeComplete) {
- ActiveMQClientLogger.LOGGER.httpHandshakeFailed(msg);
+ logger.debug("HTTP Handshake failed, received {}", msg);
ctx.close();
}
latch.countDown();
@@ -1295,7 +1296,7 @@ public class NettyConnector extends AbstractConnector {
InetAddress address = InetAddress.getByName(host);
return address.isLoopbackAddress();
} catch (UnknownHostException e) {
- ActiveMQClientLogger.LOGGER.error("Cannot resolve host", e);
+ logger.error("Cannot resolve host", e);
}
return false;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
index de5eaad2a7..db83fed081 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
@@ -23,11 +23,12 @@ import java.util.Set;
import io.netty.handler.codec.socksx.SocksVersion;
import io.netty.util.Version;
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TransportConstants {
- private static final Logger logger = Logger.getLogger(TransportConstants.class);
+ private static final Logger logger = LoggerFactory.getLogger(TransportConstants.class);
public static final String SSL_CONTEXT_PROP_NAME = "sslContext";
@@ -374,7 +375,7 @@ public class TransportConstants {
return Integer.parseInt(variable);
}
} catch (Throwable ignored) {
- logger.debug(ignored);
+ logger.debug(ignored.getMessage(), ignored);
}
return defaultValue;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultOpenSSLContextFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultOpenSSLContextFactory.java
index 225a8ca8fd..d5dd76fcb5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultOpenSSLContextFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultOpenSSLContextFactory.java
@@ -36,7 +36,7 @@ public class DefaultOpenSSLContextFactory implements OpenSSLContextFactory {
*/
@Override
public SslContext getClientSslContext(final SSLContextConfig config, final Map<String, Object> additionalOpts) throws Exception {
- log.debugf("Creating Client OpenSSL Context with %s", config);
+ log.debug("Creating Client OpenSSL Context with {}", config);
return new SSLSupport(config)
.setSslProvider(TransportConstants.OPENSSL_PROVIDER)
.createNettyClientContext();
@@ -49,7 +49,7 @@ public class DefaultOpenSSLContextFactory implements OpenSSLContextFactory {
*/
@Override
public SslContext getServerSslContext(final SSLContextConfig config, final Map<String, Object> additionalOpts) throws Exception {
- log.debugf("Creating Server OpenSSL Context with %s", config);
+ log.debug("Creating Server OpenSSL Context with {}", config);
return new SSLSupport(config)
.setSslProvider(TransportConstants.OPENSSL_PROVIDER)
.createNettyContext();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultSSLContextFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultSSLContextFactory.java
index 462d6d6e8d..ab1a71f91e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultSSLContextFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultSSLContextFactory.java
@@ -40,7 +40,7 @@ public class DefaultSSLContextFactory implements SSLContextFactory {
return SSLContext.getDefault();
}
- log.debugf("Creating JDK SSLContext with %s", config);
+ log.debug("Creating JDK SSLContext with {}", config);
return new SSLSupport(config).createContext();
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java
index cbd235782e..d17362068b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java
@@ -32,13 +32,14 @@ import org.apache.activemq.artemis.core.remoting.CloseListener;
import org.apache.activemq.artemis.core.remoting.FailureListener;
import org.apache.activemq.artemis.spi.core.remoting.Connection;
import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.security.auth.Subject;
public abstract class AbstractRemotingConnection implements RemotingConnection {
- private static final Logger logger = Logger.getLogger(AbstractRemotingConnection.class);
+ private static final Logger logger = LoggerFactory.getLogger(AbstractRemotingConnection.class);
protected final List<FailureListener> failureListeners = new CopyOnWriteArrayList<>();
protected final List<CloseListener> closeListeners = new CopyOnWriteArrayList<>();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/OpenSSLContextFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/OpenSSLContextFactory.java
index db1025a936..a6bb2e1284 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/OpenSSLContextFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/OpenSSLContextFactory.java
@@ -19,7 +19,8 @@ package org.apache.activemq.artemis.spi.core.remoting.ssl;
import java.util.Map;
import io.netty.handler.ssl.SslContext;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Service interface to create an {@link SslContext} for a configuration.
@@ -30,7 +31,7 @@ import org.jboss.logging.Logger;
*/
public interface OpenSSLContextFactory extends Comparable<OpenSSLContextFactory> {
- Logger log = Logger.getLogger(OpenSSLContextFactory.class);
+ Logger log = LoggerFactory.getLogger(OpenSSLContextFactory.class);
/**
* Release any cached {@link SslContext} instances.
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextFactory.java
index b8f3a72caf..3334a4fd2c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextFactory.java
@@ -17,7 +17,8 @@ package org.apache.activemq.artemis.spi.core.remoting.ssl;
import java.util.Map;
import javax.net.ssl.SSLContext;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Service interface to create a SSLContext for a configuration.
@@ -27,7 +28,7 @@ import org.jboss.logging.Logger;
* in your jar and fill it with the full qualified name of your implementation.
*/
public interface SSLContextFactory extends Comparable<SSLContextFactory> {
- Logger log = Logger.getLogger(SSLContextFactory.class);
+ Logger log = LoggerFactory.getLogger(SSLContextFactory.class);
/**
* @return an {@link SSLContext} for the given configuration.
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java
index 7badc9b6c4..d0d8bde191 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java
@@ -24,14 +24,17 @@ import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.api.core.client.ClientSession.AddressQuery;
-import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility class to create queues 'automatically'.
*/
public class AutoCreateUtil {
+ private static final Logger logger = LoggerFactory.getLogger(AutoCreateUtil.class);
+
public static void autoCreateQueue(ClientSession session, SimpleString destAddress, SimpleString selectorString) throws ActiveMQException {
AddressQuery response = session.addressQuery(destAddress);
/* The address query will send back exists=true even if the node only has a REMOTE binding for the destination.
@@ -47,7 +50,7 @@ public class AutoCreateUtil {
.setAddress(destAddress);
setRequiredQueueConfigurationIfNotSet(queueConfiguration,response, RoutingType.ANYCAST, selectorString, true);
session.createQueue(queueConfiguration);
- ActiveMQClientLogger.LOGGER.debug("The queue " + destAddress + " was created automatically");
+ logger.debug("The queue " + destAddress + " was created automatically");
} catch (ActiveMQQueueExistsException e) {
// The queue was created by another client/admin between the query check and send create queue packet
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
index 490d1703b0..e14dced4d6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
@@ -35,7 +35,8 @@ import java.util.List;
import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -46,7 +47,7 @@ import org.xml.sax.SAXException;
public final class XMLUtil {
- private static final Logger logger = Logger.getLogger(XMLUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(XMLUtil.class);
private XMLUtil() {
// Utility class
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java
index 4a1572adb5..991667fa80 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java
@@ -21,13 +21,14 @@ import java.util.List;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.uri.ConnectorTransportConfigurationParser;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Assert;
import org.junit.Test;
public class ConnectorTransportConfigurationParserURITest {
- private static final Logger logger = Logger.getLogger(ConnectorTransportConfigurationParserURITest.class);
+ private static final Logger logger = LoggerFactory.getLogger(ConnectorTransportConfigurationParserURITest.class);
@Test
public void testParse() throws Exception {
diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index f26d8d1d2e..7de6fadb58 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -53,8 +53,8 @@
<bundle dependency="true">mvn:commons-beanutils/commons-beanutils/${commons.beanutils.version}</bundle>
<bundle dependency="true">mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
- <bundle dependency="true">mvn:org.jboss.logging/jboss-logging/${jboss.logging.version}</bundle>
<bundle dependency="true">wrap:mvn:org.jgroups/jgroups/${jgroups.version}</bundle>
+ <bundle>wrap:mvn:org.apache.activemq/artemis-log-facade/${pom.version}</bundle>
</feature>
<feature name="artemis-core" version="${pom.version}" description="ActiveMQ Artemis broker libraries">
@@ -147,4 +147,4 @@
<bundle>mvn:org.apache.activemq/activemq-client/${activemq5-version}</bundle>
</feature>
-</features>
\ No newline at end of file
+</features>
diff --git a/artemis-jakarta-client/pom.xml b/artemis-jakarta-client/pom.xml
index 9fe69b4715..8842578a02 100644
--- a/artemis-jakarta-client/pom.xml
+++ b/artemis-jakarta-client/pom.xml
@@ -33,11 +33,21 @@
</properties>
<dependencies>
+ <!-- logging -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-processor</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -64,11 +74,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.logmanager</groupId>
- <artifactId>jboss-logmanager</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/artemis-jakarta-ra/pom.xml b/artemis-jakarta-ra/pom.xml
index 3040154d13..b1fdaedd50 100644
--- a/artemis-jakarta-ra/pom.xml
+++ b/artemis-jakarta-ra/pom.xml
@@ -36,22 +36,23 @@
<dependencies>
+ <!-- logging -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-processor</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-core-client</artifactId>
@@ -93,6 +94,7 @@
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
+
</dependencies>
<build>
diff --git a/artemis-jakarta-server/pom.xml b/artemis-jakarta-server/pom.xml
index 3df576fcda..b517aac187 100644
--- a/artemis-jakarta-server/pom.xml
+++ b/artemis-jakarta-server/pom.xml
@@ -35,21 +35,21 @@
</properties>
<dependencies>
+ <!-- logging -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>runtime</scope> <!-- TODO: decide whether to only supply via assembly or here -->
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-processor</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/artemis-jakarta-service-extensions/pom.xml b/artemis-jakarta-service-extensions/pom.xml
index 9351e8defd..30c81b0a00 100644
--- a/artemis-jakarta-service-extensions/pom.xml
+++ b/artemis-jakarta-service-extensions/pom.xml
@@ -49,31 +49,21 @@
<artifactId>artemis-commons</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- logging -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logmanager</groupId>
- <artifactId>jboss-logmanager</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.wildfly.common</groupId>
- <artifactId>wildfly-common</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-processor</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
diff --git a/artemis-jdbc-store/pom.xml b/artemis-jdbc-store/pom.xml
index 5fcab8c5dc..ce7c70a5c2 100644
--- a/artemis-jdbc-store/pom.xml
+++ b/artemis-jdbc-store/pom.xml
@@ -33,27 +33,16 @@
<dependencies>
- <!-- Logging -->
+ <!-- logging -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logmanager</groupId>
- <artifactId>jboss-logmanager</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.wildfly.common</groupId>
- <artifactId>wildfly-common</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-commons</artifactId>
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
index 24b622f748..7b775a98d7 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
@@ -25,7 +25,8 @@ import java.util.Arrays;
import java.util.stream.Stream;
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Class to hold common database functionality such as drivers and connections
@@ -33,7 +34,7 @@ import org.jboss.logging.Logger;
@SuppressWarnings("SynchronizeOnNonFinalField")
public abstract class AbstractJDBCDriver {
- private static final Logger logger = Logger.getLogger(AbstractJDBCDriver.class);
+ private static final Logger logger = LoggerFactory.getLogger(AbstractJDBCDriver.class);
protected SQLProvider sqlProvider;
@@ -74,11 +75,11 @@ public abstract class AbstractJDBCDriver {
}
connection.commit();
} catch (SQLException e) {
- logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e, dropTableSql));
+ logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e, dropTableSql).toString());
try {
connection.rollback();
} catch (SQLException rollbackEx) {
- logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), rollbackEx, dropTableSql));
+ logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), rollbackEx, dropTableSql).toString());
throw rollbackEx;
}
throw e;
@@ -87,7 +88,7 @@ public abstract class AbstractJDBCDriver {
}
private void createTableIfNotExists(String tableName, String... sqls) throws SQLException {
- logger.tracef("Validating if table %s didn't exist before creating", tableName);
+ logger.trace("Validating if table {} didn't exist before creating", tableName);
try (Connection connection = connectionProvider.getConnection()) {
try {
connection.setAutoCommit(false);
@@ -96,12 +97,12 @@ public abstract class AbstractJDBCDriver {
if (rs == null || !rs.next()) {
tableExists = false;
if (logger.isTraceEnabled()) {
- logger.tracef("Table %s did not exist, creating it with SQL=%s", tableName, Arrays.toString(sqls));
+ logger.trace("Table {} did not exist, creating it with SQL={}", tableName, Arrays.toString(sqls));
}
if (rs != null) {
final SQLWarning sqlWarning = rs.getWarnings();
if (sqlWarning != null) {
- logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), sqlWarning));
+ logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), sqlWarning).toString());
}
}
} else {
@@ -109,13 +110,13 @@ public abstract class AbstractJDBCDriver {
}
}
if (tableExists) {
- logger.tracef("Validating if the existing table %s is initialized or not", tableName);
+ logger.trace("Validating if the existing table {} is initialized or not", tableName);
try (Statement statement = connection.createStatement();
ResultSet cntRs = statement.executeQuery(sqlProvider.getCountJournalRecordsSQL())) {
- logger.tracef("Validation of the existing table %s initialization is started", tableName);
+ logger.trace("Validation of the existing table {} initialization is started", tableName);
int rows;
if (cntRs.next() && (rows = cntRs.getInt(1)) > 0) {
- logger.tracef("Table %s did exist but is not empty. Skipping initialization. Found %d rows.", tableName, rows);
+ logger.trace("Table {} did exist but is not empty. Skipping initialization. Found %d rows.", tableName, rows);
if (logger.isDebugEnabled()) {
final long expectedRows = Stream.of(sqls).map(String::toUpperCase).filter(sql -> sql.contains("INSERT INTO")).count();
if (rows < expectedRows) {
@@ -130,9 +131,9 @@ public abstract class AbstractJDBCDriver {
return !(upperCaseSql.contains("CREATE TABLE") || upperCaseSql.contains("CREATE INDEX"));
}).toArray(String[]::new);
if (sqls.length > 0) {
- logger.tracef("Table %s did exist but is empty. Starting initialization.", tableName);
+ logger.trace("Table {} did exist but is empty. Starting initialization.", tableName);
} else {
- logger.tracef("Table %s did exist but is empty. Initialization completed: no initialization statements left.", tableName);
+ logger.trace("Table {} did exist but is empty. Initialization completed: no initialization statements left.", tableName);
connection.commit();
}
}
@@ -141,7 +142,7 @@ public abstract class AbstractJDBCDriver {
//some DBMS just return stale information about table existence
//and can fail on later attempts to access them
if (logger.isTraceEnabled()) {
- logger.trace(JDBCUtils.appendSQLExceptionDetails(new StringBuilder("Can't verify the initialization of table ").append(tableName).append(" due to:"), e, sqlProvider.getCountJournalRecordsSQL()));
+ logger.trace(JDBCUtils.appendSQLExceptionDetails(new StringBuilder("Can't verify the initialization of table ").append(tableName).append(" due to:"), e, sqlProvider.getCountJournalRecordsSQL()).toString());
}
try {
connection.rollback();
@@ -149,7 +150,7 @@ public abstract class AbstractJDBCDriver {
logger.debug("Rollback failed while validating initialization of a table", rollbackEx);
}
connection.setAutoCommit(false);
- logger.tracef("Table %s seems to exist, but we can't verify the initialization. Keep trying to create and initialize.", tableName);
+ logger.trace("Table {} seems to exist, but we can't verify the initialization. Keep trying to create and initialize.", tableName);
}
}
if (sqls.length > 0) {
@@ -158,7 +159,7 @@ public abstract class AbstractJDBCDriver {
statement.executeUpdate(sql);
final SQLWarning statementSqlWarning = statement.getWarnings();
if (statementSqlWarning != null) {
- logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), statementSqlWarning, sql));
+ logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), statementSqlWarning, sql).toString());
}
}
}
@@ -167,11 +168,11 @@ public abstract class AbstractJDBCDriver {
}
} catch (SQLException e) {
final String sqlStatements = String.join("\n", sqls);
- logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e, sqlStatements));
+ logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e, sqlStatements).toString());
try {
connection.rollback();
} catch (SQLException rollbackEx) {
- logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), rollbackEx, sqlStatements));
+ logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), rollbackEx, sqlStatements).toString());
throw rollbackEx;
}
throw e;
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCConnectionProvider.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCConnectionProvider.java
index 9f972d39d8..a5237c1da7 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCConnectionProvider.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCConnectionProvider.java
@@ -25,12 +25,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.artemis.jdbc.store.logging.LoggingConnection;
import org.apache.activemq.artemis.jdbc.store.sql.PropertySQLProvider;
-import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JDBCConnectionProvider {
- private static final Logger logger = Logger.getLogger(JDBCConnectionProvider.class);
+ private static final Logger logger = LoggerFactory.getLogger(JDBCConnectionProvider.class);
private DataSource dataSource;
private Executor networkTimeoutExecutor;
private int networkTimeoutMillis;
@@ -64,7 +64,7 @@ public class JDBCConnectionProvider {
connection = new LoggingConnection(connection, logger);
}
} catch (SQLException e) {
- logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e));
+ logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e).toString());
throw e;
}
@@ -78,8 +78,8 @@ public class JDBCConnectionProvider {
connection.setNetworkTimeout(this.networkTimeoutExecutor, this.networkTimeoutMillis);
} catch (SQLException e) {
supportNetworkTimeout = false;
- logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e));
- ActiveMQJournalLogger.LOGGER.warn("Unable to set a network timeout on the JDBC connection: won't retry again in the future");
+ logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e).toString());
+ logger.warn("Unable to set a network timeout on the JDBC connection: won't retry again in the future");
} catch (Throwable throwable) {
supportNetworkTimeout = false;
//it included SecurityExceptions and UnsupportedOperationException
@@ -112,7 +112,7 @@ public class JDBCConnectionProvider {
}
}
} catch (SQLException e) {
- logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e));
+ logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e).toString());
}
}
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
index 37c1e97d89..9eeb13e72c 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
@@ -21,28 +21,29 @@ import java.util.Map;
import org.apache.activemq.artemis.jdbc.store.sql.PropertySQLProvider;
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JDBCUtils {
- private static final Logger logger = Logger.getLogger(JDBCUtils.class);
+ private static final Logger logger = LoggerFactory.getLogger(JDBCUtils.class);
public static SQLProvider.Factory getSQLProviderFactory(String url) {
PropertySQLProvider.Factory.SQLDialect dialect = PropertySQLProvider.Factory.identifyDialect(url);
- logger.tracef("getSQLProvider Returning SQL provider for dialect %s for url::%s", dialect, url);
+ logger.trace("getSQLProvider Returning SQL provider for dialect {} for url::{}", dialect, url);
return new PropertySQLProvider.Factory(dialect);
}
public static SQLProvider getSQLProvider(String driverClass, String tableName, SQLProvider.DatabaseStoreType storeType) {
PropertySQLProvider.Factory.SQLDialect dialect = PropertySQLProvider.Factory.identifyDialect(driverClass);
- logger.tracef("getSQLProvider Returning SQL provider for dialect %s for driver::%s, tableName::%s", dialect, driverClass, tableName);
+ logger.trace("getSQLProvider Returning SQL provider for dialect {} for driver::{}, tableName::{}", dialect, driverClass, tableName);
PropertySQLProvider.Factory factory = new PropertySQLProvider.Factory(dialect);
return factory.create(tableName, storeType);
}
public static SQLProvider getSQLProvider(Map<String, Object> dataSourceProperties, String tableName, SQLProvider.DatabaseStoreType storeType) {
PropertySQLProvider.Factory.SQLDialect dialect = PropertySQLProvider.Factory.investigateDialect(dataSourceProperties);
- logger.tracef("getSQLProvider Returning SQL provider for dialect %s, tableName::%s", dialect, tableName);
+ logger.trace("getSQLProvider Returning SQL provider for dialect {}, tableName::{}", dialect, tableName);
PropertySQLProvider.Factory factory = new PropertySQLProvider.Factory(dialect);
return factory.create(tableName, storeType);
}
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
index 1ee9c77677..54255cf88e 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
@@ -34,11 +34,12 @@ import org.apache.activemq.artemis.core.io.SequentialFile;
import org.apache.activemq.artemis.core.io.buffer.TimedBuffer;
import org.apache.activemq.artemis.core.journal.EncodingSupport;
import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JDBCSequentialFile implements SequentialFile {
- private static final Logger logger = Logger.getLogger(JDBCSequentialFile.class);
+ private static final Logger logger = LoggerFactory.getLogger(JDBCSequentialFile.class);
private final String filename;
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java
index c9169c52e8..0848e9b05b 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java
@@ -32,13 +32,13 @@ import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
import org.apache.activemq.artemis.core.server.ActiveMQComponent;
import org.apache.activemq.artemis.jdbc.store.drivers.JDBCConnectionProvider;
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
-import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JDBCSequentialFileFactory implements SequentialFileFactory, ActiveMQComponent {
- private static final Logger logger = Logger.getLogger(JDBCSequentialFile.class);
+ private static final Logger logger = LoggerFactory.getLogger(JDBCSequentialFileFactory.class);
private boolean started;
@@ -104,7 +104,7 @@ public class JDBCSequentialFileFactory implements SequentialFileFactory, ActiveM
try {
dbDriver.stop();
} catch (SQLException e) {
- ActiveMQJournalLogger.LOGGER.error("Error stopping file factory, unable to close db connection");
+ logger.error("Error stopping file factory, unable to close db connection");
}
started = false;
}
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
index ab6906c3cb..5f3f81d2a7 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
@@ -29,12 +29,13 @@ import java.util.List;
import org.apache.activemq.artemis.jdbc.store.drivers.AbstractJDBCDriver;
import org.apache.activemq.artemis.jdbc.store.drivers.JDBCConnectionProvider;
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings("SynchronizeOnNonFinalField")
public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
- private static final Logger logger = Logger.getLogger(JDBCSequentialFileFactoryDriver.class);
+ private static final Logger logger = LoggerFactory.getLogger(JDBCSequentialFileFactoryDriver.class);
protected String deleteFile;
protected String createFile;
@@ -317,7 +318,7 @@ public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
final long filePosition = file.position();
readLength = (int) calculateReadLength(blobLength, bytesRemaining, filePosition);
if (logger.isDebugEnabled()) {
- logger.debugf("trying read %d bytes: blobLength = %d bytesRemaining = %d filePosition = %d",
+ logger.debug("trying read {} bytes: blobLength = {} bytesRemaining = {} filePosition = {}",
readLength, blobLength, bytesRemaining, filePosition);
}
if (readLength < 0) {
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
index a4281b33dc..90d7967e3f 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
@@ -54,11 +54,12 @@ import org.apache.activemq.artemis.jdbc.store.drivers.AbstractJDBCDriver;
import org.apache.activemq.artemis.jdbc.store.drivers.JDBCConnectionProvider;
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
import org.apache.activemq.artemis.utils.collections.SparseArrayLinkedList;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
- private static final Logger logger = Logger.getLogger(JDBCJournalImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(JDBCJournalImpl.class);
// Sync Delay in ms
//private static final int SYNC_DELAY = 5;
@@ -159,7 +160,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
@Override
protected void prepareStatements() {
- logger.tracef("preparing statements");
+ logger.trace("preparing statements");
insertJournalRecords = sqlProvider.getInsertJournalRecordsSQL();
selectJournalRecords = sqlProvider.getSelectJournalRecordsSQL();
countJournalRecords = sqlProvider.getCountJournalRecordsSQL();
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java
index 1ae8d1d91b..37814f002f 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java
@@ -31,10 +31,13 @@ import org.apache.activemq.artemis.core.journal.EncodingSupport;
import org.apache.activemq.artemis.core.journal.IOCompletion;
import org.apache.activemq.artemis.core.persistence.Persister;
import org.apache.activemq.artemis.core.journal.RecordInfo;
-import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class JDBCJournalRecord {
+
+ private static final Logger logger = LoggerFactory.getLogger(JDBCJournalRecord.class);
/*
Database Table Schema:
@@ -137,7 +140,7 @@ class JDBCJournalRecord {
record.read(recordBytes);
txData.read(txDataBytes);
} catch (IOException e) {
- ActiveMQJournalLogger.LOGGER.error("Error occurred whilst reading Journal Record", e);
+ logger.error("Error occurred whilst reading Journal Record", e);
throw e;
}
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingConnection.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingConnection.java
index 8a9284abeb..b2dc1dc4b4 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingConnection.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingConnection.java
@@ -37,7 +37,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Executor;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
public class LoggingConnection implements Connection {
@@ -47,8 +47,6 @@ public class LoggingConnection implements Connection {
private Logger logger;
- private Logger.Level level = Logger.Level.TRACE;
-
public LoggingConnection(Connection connection, Logger logger) {
this.connection = connection;
this.logger = logger;
@@ -66,132 +64,132 @@ public class LoggingConnection implements Connection {
@Override
public Statement createStatement() throws SQLException {
LoggingStatement statement = new LoggingStatement(connection.createStatement(), logger);
- logger.logf(level, "%s.createStatement() = %s", connectionID, statement.getStatementID());
+ logger.trace("{}.createStatement() = {}", connectionID, statement.getStatementID());
return statement;
}
@Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
LoggingPreparedStatement statement = new LoggingPreparedStatement(connection.prepareStatement(sql), logger);
- logger.logf(level, "%s.prepareStatement(%s) = %s", connectionID, sql, statement.getStatementID());
+ logger.trace("{}.prepareStatement({}) = {}", connectionID, sql, statement.getStatementID());
return statement;
}
@Override
public CallableStatement prepareCall(String sql) throws SQLException {
CallableStatement statement = connection.prepareCall(sql);
- logger.logf(level, "%s.prepareCall(%s) = %s", connectionID, sql, LoggingUtil.getID(statement));
+ logger.trace("{}.prepareCall({}) = {}", connectionID, sql, LoggingUtil.getID(statement));
return statement;
}
@Override
public String nativeSQL(String sql) throws SQLException {
String x = connection.nativeSQL(sql);
- logger.logf(level, "%s.nativeSQL(%s) = %s", connectionID, sql, x);
+ logger.trace("{}.nativeSQL({}) = {}", connectionID, sql, x);
return x;
}
@Override
public void setAutoCommit(boolean autoCommit) throws SQLException {
- logger.logf(level, "%s.setAutoCommit(%s)", connectionID, autoCommit);
+ logger.trace("{}.setAutoCommit({})", connectionID, autoCommit);
connection.setAutoCommit(autoCommit);
}
@Override
public boolean getAutoCommit() throws SQLException {
boolean x = connection.getAutoCommit();
- logger.logf(level, "%s.getAutoCommit() = %s", connectionID, x);
+ logger.trace("{}.getAutoCommit() = {}", connectionID, x);
return x;
}
@Override
public void commit() throws SQLException {
- logger.logf(level, "%s.commit()", connectionID);
+ logger.trace("{}.commit()", connectionID);
connection.commit();
}
@Override
public void rollback() throws SQLException {
- logger.logf(level, "%s.rollback()", connectionID);
+ logger.trace("{}.rollback()", connectionID);
connection.rollback();
}
@Override
public void close() throws SQLException {
- logger.logf(level, "%s.close()", connectionID);
+ logger.trace("{}.close()", connectionID);
connection.close();
}
@Override
public boolean isClosed() throws SQLException {
boolean x = connection.isClosed();
- logger.logf(level, "%s.isClosed() = %s", connectionID, x);
+ logger.trace("{}.isClosed() = {}", connectionID, x);
return x;
}
@Override
public DatabaseMetaData getMetaData() throws SQLException {
DatabaseMetaData x = connection.getMetaData();
- logger.logf(level, "%s.getMetaData() = %s", connectionID, x);
+ logger.trace("{}.getMetaData() = {}", connectionID, x);
return x;
}
@Override
public void setReadOnly(boolean readOnly) throws SQLException {
- logger.logf(level, "%s.setReadOnly(%s)", connectionID, readOnly);
+ logger.trace("{}.setReadOnly({})", connectionID, readOnly);
connection.setReadOnly(readOnly);
}
@Override
public boolean isReadOnly() throws SQLException {
boolean x = connection.isReadOnly();
- logger.logf(level, "%s.isReadOnly() = %s", connectionID, x);
+ logger.trace("{}.isReadOnly() = {}", connectionID, x);
return x;
}
@Override
public void setCatalog(String catalog) throws SQLException {
- logger.logf(level, "%s.setCatalog(%s)", connectionID, catalog);
+ logger.trace("{}.setCatalog({})", connectionID, catalog);
connection.setCatalog(catalog);
}
@Override
public String getCatalog() throws SQLException {
String x = connection.getCatalog();
- logger.logf(level, "%s.getCatalog() = %s", connectionID, x);
+ logger.trace("{}.getCatalog() = {}", connectionID, x);
return x;
}
@Override
public void setTransactionIsolation(int level) throws SQLException {
- logger.logf(this.level, "%s.setTransactionIsolation(%s)", connectionID, level);
+ logger.trace("{}.setTransactionIsolation({})", connectionID, level);
connection.setTransactionIsolation(level);
}
@Override
public int getTransactionIsolation() throws SQLException {
int x = connection.getTransactionIsolation();
- logger.logf(level, "%s.getTransactionIsolation() = %s", connectionID, x);
+ logger.trace("{}.getTransactionIsolation() = {}", connectionID, x);
return x;
}
@Override
public SQLWarning getWarnings() throws SQLException {
SQLWarning x = connection.getWarnings();
- logger.logf(level, "%s.getWarnings() = %s", connectionID, x);
+ logger.trace("{}.getWarnings() = {}", connectionID, x);
return x;
}
@Override
public void clearWarnings() throws SQLException {
- logger.logf(level, "%s.clearWarnings()", connectionID);
+ logger.trace("{}.clearWarnings()", connectionID);
connection.clearWarnings();
}
@Override
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
LoggingStatement statement = new LoggingStatement(connection.createStatement(resultSetType, resultSetConcurrency), logger);
- logger.logf(level, "%s.createStatement(%s, %s) = %s", connectionID, resultSetType, resultSetConcurrency, statement.getStatementID());
+ logger.trace("{}.createStatement({}, {}) = {}", connectionID, resultSetType, resultSetConcurrency, statement.getStatementID());
return statement;
}
@@ -200,66 +198,66 @@ public class LoggingConnection implements Connection {
int resultSetType,
int resultSetConcurrency) throws SQLException {
LoggingPreparedStatement statement = new LoggingPreparedStatement(connection.prepareStatement(sql, resultSetType, resultSetConcurrency), logger);
- logger.logf(level, "%s.prepareStatement(%s, %s, %s) = %s", connectionID, sql, resultSetType, resultSetConcurrency, statement.getStatementID());
+ logger.trace("{}.prepareStatement({}, {}, {}) = {}", connectionID, sql, resultSetType, resultSetConcurrency, statement.getStatementID());
return statement;
}
@Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
CallableStatement statement = connection.prepareCall(sql, resultSetType, resultSetConcurrency);
- logger.logf(level, "%s.createStatement(%s, %s) = %s", connectionID, sql, resultSetType, resultSetConcurrency, LoggingUtil.getID(statement));
+ logger.trace("{}.createStatement({}, {}) = {}", connectionID, sql, resultSetType, resultSetConcurrency, LoggingUtil.getID(statement));
return statement;
}
@Override
public Map<String, Class<?>> getTypeMap() throws SQLException {
Map<String, Class<?>> x = connection.getTypeMap();
- logger.logf(level, "%s.getTypeMap() = %s", connectionID, x);
+ logger.trace("{}.getTypeMap() = {}", connectionID, x);
return x;
}
@Override
public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
- logger.logf(level, "%s.setTypeMap(%s)", connectionID, map);
+ logger.trace("{}.setTypeMap({})", connectionID, map);
connection.setTypeMap(map);
}
@Override
public void setHoldability(int holdability) throws SQLException {
- logger.logf(level, "%s.setHoldability(%s)", connectionID, holdability);
+ logger.trace("{}.setHoldability({})", connectionID, holdability);
connection.setHoldability(holdability);
}
@Override
public int getHoldability() throws SQLException {
int x = connection.getHoldability();
- logger.logf(level, "%s.getHoldability() = %s", connectionID, x);
+ logger.trace("{}.getHoldability() = {}", connectionID, x);
return x;
}
@Override
public Savepoint setSavepoint() throws SQLException {
Savepoint x = connection.setSavepoint();
- logger.logf(level, "%s.setSavepoint() = %s", connectionID, x);
+ logger.trace("{}.setSavepoint() = {}", connectionID, x);
return x;
}
@Override
public Savepoint setSavepoint(String name) throws SQLException {
Savepoint x = connection.setSavepoint(name);
- logger.logf(level, "%s.setSavepoint(%s) = %s", connectionID, name, x);
+ logger.trace("{}.setSavepoint({}) = {}", connectionID, name, x);
return x;
}
@Override
public void rollback(Savepoint savepoint) throws SQLException {
- logger.logf(level, "%s.rollback(%s)", connectionID, savepoint);
+ logger.trace("{}.rollback({})", connectionID, savepoint);
connection.rollback(savepoint);
}
@Override
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- logger.logf(level, "%s.releaseSavepoint(%s)", connectionID, savepoint);
+ logger.trace("{}.releaseSavepoint({})", connectionID, savepoint);
connection.releaseSavepoint(savepoint);
}
@@ -268,7 +266,7 @@ public class LoggingConnection implements Connection {
int resultSetConcurrency,
int resultSetHoldability) throws SQLException {
LoggingStatement statement = new LoggingStatement(connection.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability), logger);
- logger.logf(level, "%s.createStatement(%s, %s, %s) = %s", connectionID, resultSetType, resultSetConcurrency, resultSetHoldability, statement.getStatementID());
+ logger.trace("{}.createStatement({}, {}, {}) = {}", connectionID, resultSetType, resultSetConcurrency, resultSetHoldability, statement.getStatementID());
return statement;
}
@@ -278,7 +276,7 @@ public class LoggingConnection implements Connection {
int resultSetConcurrency,
int resultSetHoldability) throws SQLException {
LoggingPreparedStatement statement = new LoggingPreparedStatement(connection.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability), logger);
- logger.logf(level, "%s.prepareStatement(%s, %s, %s, %s) = %s", connectionID, sql, resultSetType, resultSetConcurrency, resultSetHoldability, statement.getStatementID());
+ logger.trace("{}.prepareStatement({}, {}, {}, {}) = {}", connectionID, sql, resultSetType, resultSetConcurrency, resultSetHoldability, statement.getStatementID());
return statement;
}
@@ -288,149 +286,149 @@ public class LoggingConnection implements Connection {
int resultSetConcurrency,
int resultSetHoldability) throws SQLException {
CallableStatement statement = connection.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
- logger.logf(level, "%s.prepareCall(%s, %s, %s, %s) = %s", connectionID, sql, resultSetType, resultSetConcurrency, resultSetHoldability, LoggingUtil.getID(statement));
+ logger.trace("{}.prepareCall({}, {}, {}, {}) = {}", connectionID, sql, resultSetType, resultSetConcurrency, resultSetHoldability, LoggingUtil.getID(statement));
return statement;
}
@Override
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
LoggingPreparedStatement preparedStatement = new LoggingPreparedStatement(connection.prepareStatement(sql, autoGeneratedKeys), logger);
- logger.logf(level, "%s.prepareStatement(%s, %s) = %s", connectionID, sql, autoGeneratedKeys, preparedStatement.getStatementID());
+ logger.trace("{}.prepareStatement({}, {}) = {}", connectionID, sql, autoGeneratedKeys, preparedStatement.getStatementID());
return preparedStatement;
}
@Override
public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
LoggingPreparedStatement statement = new LoggingPreparedStatement(connection.prepareStatement(sql, columnIndexes), logger);
- logger.logf(level, "%s.prepareStatement(%s, %s) = %s", connectionID, sql, Arrays.toString(columnIndexes), statement.getStatementID());
+ logger.trace("{}.prepareStatement({}, {}) = {}", connectionID, sql, Arrays.toString(columnIndexes), statement.getStatementID());
return statement;
}
@Override
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
LoggingPreparedStatement statement = new LoggingPreparedStatement(connection.prepareStatement(sql, columnNames), logger);
- logger.logf(level, "%s.prepareStatement(%s, %s) = %s", connectionID, sql, Arrays.toString(columnNames), statement.getStatementID());
+ logger.trace("{}.prepareStatement({}, {}) = {}", connectionID, sql, Arrays.toString(columnNames), statement.getStatementID());
return statement;
}
@Override
public Clob createClob() throws SQLException {
Clob x = connection.createClob();
- logger.logf(level, "%s.createClob() = %s", connectionID, x);
+ logger.trace("{}.createClob() = {}", connectionID, x);
return x;
}
@Override
public Blob createBlob() throws SQLException {
Blob x = connection.createBlob();
- logger.logf(level, "%s.createBlob() = %s", connectionID, x);
+ logger.trace("{}.createBlob() = {}", connectionID, x);
return x;
}
@Override
public NClob createNClob() throws SQLException {
NClob x = connection.createNClob();
- logger.logf(level, "%s.createNClob() = %s", connectionID, x);
+ logger.trace("{}.createNClob() = {}", connectionID, x);
return x;
}
@Override
public SQLXML createSQLXML() throws SQLException {
SQLXML x = connection.createSQLXML();
- logger.logf(level, "%s.createSQLXML() = %s", connectionID, x);
+ logger.trace("{}.createSQLXML() = {}", connectionID, x);
return x;
}
@Override
public boolean isValid(int timeout) throws SQLException {
boolean x = connection.isValid(timeout);
- logger.logf(level, "%s.isValid(%s) = %s", connectionID, timeout, x);
+ logger.trace("{}.isValid({}) = {}", connectionID, timeout, x);
return x;
}
@Override
public void setClientInfo(String name, String value) throws SQLClientInfoException {
- logger.logf(level, "%s.setClientInfo(%s, %s)", connectionID, name, value);
+ logger.trace("{}.setClientInfo({}, {})", connectionID, name, value);
connection.setClientInfo(name, value);
}
@Override
public void setClientInfo(Properties properties) throws SQLClientInfoException {
- logger.logf(level, "%s.setClientInfo(%s)", connectionID, properties);
+ logger.trace("{}.setClientInfo({})", connectionID, properties);
connection.setClientInfo(properties);
}
@Override
public String getClientInfo(String name) throws SQLException {
String x = connection.getClientInfo(name);
- logger.logf(level, "%s.getClientInfo(%s) = %s", connectionID, name, x);
+ logger.trace("{}.getClientInfo({}) = {}", connectionID, name, x);
return x;
}
@Override
public Properties getClientInfo() throws SQLException {
Properties x = connection.getClientInfo();
- logger.logf(level, "%s.getClientInfo() = %s", connectionID, x);
+ logger.trace("{}.getClientInfo() = {}", connectionID, x);
return x;
}
@Override
public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
Array x = connection.createArrayOf(typeName, elements);
- logger.logf(level, "%s.createArrayOf(%s, %s) = %s", connectionID, typeName, Arrays.toString(elements), x);
+ logger.trace("{}.createArrayOf({}, {}) = {}", connectionID, typeName, Arrays.toString(elements), x);
return x;
}
@Override
public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
Struct x = connection.createStruct(typeName, attributes);
- logger.logf(level, "%s.createStruct(%s, %s) = %s", connectionID, typeName, Arrays.toString(attributes), x);
+ logger.trace("{}.createStruct({}, {}) = {}", connectionID, typeName, Arrays.toString(attributes), x);
return x;
}
@Override
public void setSchema(String schema) throws SQLException {
- logger.logf(level, "%s.setSchema(%s)", connectionID, schema);
+ logger.trace("{}.setSchema({})", connectionID, schema);
connection.setSchema(schema);
}
@Override
public String getSchema() throws SQLException {
String x = connection.getSchema();
- logger.logf(level, "%s.getSchema() = %s", connectionID, x);
+ logger.trace("{}.getSchema() = {}", connectionID, x);
return x;
}
@Override
public void abort(Executor executor) throws SQLException {
- logger.logf(level, "%s.abort(%s)", connectionID, executor);
+ logger.trace("{}.abort({})", connectionID, executor);
connection.abort(executor);
}
@Override
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
- logger.logf(level, "%s.setNetworkTimeout(%s, %d)", connectionID, executor, milliseconds);
+ logger.trace("{}.setNetworkTimeout({}, {})", connectionID, executor, milliseconds);
connection.setNetworkTimeout(executor, milliseconds);
}
@Override
public int getNetworkTimeout() throws SQLException {
int x = connection.getNetworkTimeout();
- logger.logf(level, "%s.getNetworkTimeout() = %s", connectionID, x);
+ logger.trace("{}.getNetworkTimeout() = {}", connectionID, x);
return x;
}
@Override
public <T> T unwrap(Class<T> iface) throws SQLException {
T x = connection.unwrap(iface);
- logger.logf(level, "%s.unwrap(%s) = %s", connectionID, iface, x);
+ logger.trace("{}.unwrap({}) = {}", connectionID, iface, x);
return x;
}
@Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
boolean x = connection.isWrapperFor(iface);
- logger.logf(level, "%s.isWrapperFor() = %s", connectionID, iface, x);
+ logger.trace("{}.isWrapperFor() = {}", connectionID, iface, x);
return x;
}
}
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingPreparedStatement.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingPreparedStatement.java
index 4cf270d4bb..e1568eba33 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingPreparedStatement.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingPreparedStatement.java
@@ -39,7 +39,7 @@ import java.sql.Time;
import java.sql.Timestamp;
import java.util.Calendar;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
public class LoggingPreparedStatement extends LoggingStatement implements PreparedStatement {
@@ -53,354 +53,354 @@ public class LoggingPreparedStatement extends LoggingStatement implements Prepar
@Override
public ResultSet executeQuery() throws SQLException {
LoggingResultSet rs = new LoggingResultSet(preparedStatement.executeQuery(), logger);
- logger.logf(level, "%s.executeQuery() = %s", statementID, rs.getResultSetID());
+ logger.trace("{}.executeQuery() = {}", statementID, rs.getResultSetID());
return rs;
}
@Override
public int executeUpdate() throws SQLException {
int i = preparedStatement.executeUpdate();
- logger.logf(level, "%s.executeUpdate() = %s", statementID, i);
+ logger.trace("{}.executeUpdate() = {}", statementID, i);
return i;
}
@Override
public void setNull(int parameterIndex, int sqlType) throws SQLException {
- logger.logf(level, "%s.setNull(%d, %d)", statementID, parameterIndex, sqlType);
+ logger.trace("{}.setNull({}, {})", statementID, parameterIndex, sqlType);
preparedStatement.setNull(parameterIndex, sqlType);
}
@Override
public void setBoolean(int parameterIndex, boolean x) throws SQLException {
- logger.logf(level, "%s.setBoolean(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setBoolean({}, {})", statementID, parameterIndex, x);
preparedStatement.setBoolean(parameterIndex, x);
}
@Override
public void setByte(int parameterIndex, byte x) throws SQLException {
- logger.logf(level, "%s.setByte(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setByte({}, {})", statementID, parameterIndex, x);
preparedStatement.setByte(parameterIndex, x);
}
@Override
public void setShort(int parameterIndex, short x) throws SQLException {
- logger.logf(level, "%s.setShort(%d, %d)", statementID, parameterIndex, x);
+ logger.trace("{}.setShort({}, {})", statementID, parameterIndex, x);
preparedStatement.setShort(parameterIndex, x);
}
@Override
public void setInt(int parameterIndex, int x) throws SQLException {
- logger.logf(level, "%s.setInt(%d, %d)", statementID, parameterIndex, x);
+ logger.trace("{}.setInt({}, {})", statementID, parameterIndex, x);
preparedStatement.setInt(parameterIndex, x);
}
@Override
public void setLong(int parameterIndex, long x) throws SQLException {
- logger.logf(level, "%s.setLong(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setLong({}, {})", statementID, parameterIndex, x);
preparedStatement.setLong(parameterIndex, x);
}
@Override
public void setFloat(int parameterIndex, float x) throws SQLException {
- logger.logf(level, "%s.setFloat(%d, %f)", statementID, parameterIndex, x);
+ logger.trace("{}.setFloat({}, {})", statementID, parameterIndex, x);
preparedStatement.setFloat(parameterIndex, x);
}
@Override
public void setDouble(int parameterIndex, double x) throws SQLException {
- logger.logf(level, "%s.setDouble(%d, %d)", statementID, parameterIndex, x);
+ logger.trace("{}.setDouble({}, {})", statementID, parameterIndex, x);
preparedStatement.setDouble(parameterIndex, x);
}
@Override
public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException {
- logger.logf(level, "%s.setBigDecimal(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setBigDecimal({}, {})", statementID, parameterIndex, x);
preparedStatement.setBigDecimal(parameterIndex, x);
}
@Override
public void setString(int parameterIndex, String x) throws SQLException {
- logger.logf(level, "%s.setString(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setString({}, {})", statementID, parameterIndex, x);
preparedStatement.setString(parameterIndex, x);
}
@Override
public void setBytes(int parameterIndex, byte[] x) throws SQLException {
- logger.logf(level, "%s.setBytes(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setBytes({}, {})", statementID, parameterIndex, x);
preparedStatement.setBytes(parameterIndex, x);
}
@Override
public void setDate(int parameterIndex, Date x) throws SQLException {
- logger.logf(level, "%s.setDate(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setDate({}, {})", statementID, parameterIndex, x);
preparedStatement.setDate(parameterIndex, x);
}
@Override
public void setTime(int parameterIndex, Time x) throws SQLException {
- logger.logf(level, "%s.setTime(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setTime({}, {})", statementID, parameterIndex, x);
preparedStatement.setTime(parameterIndex, x);
}
@Override
public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {
- logger.logf(level, "%s.setTimestamp(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setTimestamp({}, {})", statementID, parameterIndex, x);
preparedStatement.setTimestamp(parameterIndex, x);
}
@Override
public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException {
- logger.logf(level, "%s.setAsciiStream(%d, %s, %d)", statementID, parameterIndex, x, length);
+ logger.trace("{}.setAsciiStream({}, {}, {})", statementID, parameterIndex, x, length);
preparedStatement.setAsciiStream(parameterIndex, x, length);
}
@Override
public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException {
- logger.logf(level, "%s.setUnicodeStream(%d, %s, %d)", statementID, parameterIndex, x, length);
+ logger.trace("{}.setUnicodeStream({}, {}, {})", statementID, parameterIndex, x, length);
preparedStatement.setUnicodeStream(parameterIndex, x, length);
}
@Override
public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException {
- logger.logf(level, "%s.setBinaryStream(%d, %s, %d)", statementID, parameterIndex, x, length);
+ logger.trace("{}.setBinaryStream({}, {}, {})", statementID, parameterIndex, x, length);
preparedStatement.setBinaryStream(parameterIndex, x, length);
}
@Override
public void clearParameters() throws SQLException {
- logger.logf(level, "%s.clearParameters()", statementID);
+ logger.trace("{}.clearParameters()", statementID);
preparedStatement.clearParameters();
}
@Override
public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException {
- logger.logf(level, "%s.setObject(%d, %s, %d)", statementID, parameterIndex, x, targetSqlType);
+ logger.trace("{}.setObject({}, {}, {})", statementID, parameterIndex, x, targetSqlType);
preparedStatement.setObject(parameterIndex, x, targetSqlType);
}
@Override
public void setObject(int parameterIndex, Object x) throws SQLException {
- logger.logf(level, "%s.setObject(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setObject({}, {})", statementID, parameterIndex, x);
preparedStatement.setObject(parameterIndex, x);
}
@Override
public boolean execute() throws SQLException {
boolean b = preparedStatement.execute();
- logger.logf(level, "%s.execute() = %s", statementID, b);
+ logger.trace("{}.execute() = {}", statementID, b);
return b;
}
@Override
public void addBatch() throws SQLException {
- logger.logf(level, "%s.addBatch()", statementID);
+ logger.trace("{}.addBatch()", statementID);
preparedStatement.addBatch();
}
@Override
public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException {
- logger.logf(level, "%s.setCharacterStream(%d, %s, %d)", statementID, parameterIndex, reader, length);
+ logger.trace("{}.setCharacterStream({}, {}, {})", statementID, parameterIndex, reader, length);
preparedStatement.setCharacterStream(parameterIndex, reader, length);
}
@Override
public void setRef(int parameterIndex, Ref x) throws SQLException {
- logger.logf(level, "%s.setRef(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setRef({}, {})", statementID, parameterIndex, x);
preparedStatement.setRef(parameterIndex, x);
}
@Override
public void setBlob(int parameterIndex, Blob x) throws SQLException {
- logger.logf(level, "%s.setBlob(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setBlob({}, {})", statementID, parameterIndex, x);
preparedStatement.setBlob(parameterIndex, x);
}
@Override
public void setClob(int parameterIndex, Clob x) throws SQLException {
- logger.logf(level, "%s.setClob(%d, %x)", statementID, parameterIndex, x);
+ logger.trace("{}.setClob({}, {})", statementID, parameterIndex, x);
preparedStatement.setClob(parameterIndex, x);
}
@Override
public void setArray(int parameterIndex, Array x) throws SQLException {
- logger.logf(level, "%s.setArray(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setArray({}, {})", statementID, parameterIndex, x);
preparedStatement.setArray(parameterIndex, x);
}
@Override
public ResultSetMetaData getMetaData() throws SQLException {
ResultSetMetaData resultSetMetaData = preparedStatement.getMetaData();
- logger.logf(level, "%s.getMetaData() = %s", statementID, LoggingUtil.getID(resultSetMetaData));
+ logger.trace("{}.getMetaData() = {}", statementID, LoggingUtil.getID(resultSetMetaData));
return resultSetMetaData;
}
@Override
public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {
- logger.logf(level, "%s.setDate(%d, %s, %s)", statementID, parameterIndex, x, cal);
+ logger.trace("{}.setDate({}, {}, {})", statementID, parameterIndex, x, cal);
preparedStatement.setDate(parameterIndex, x, cal);
}
@Override
public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {
- logger.logf(level, "%s.setTime(%d, %s, %s)", statementID, parameterIndex, x, cal);
+ logger.trace("{}.setTime({}, {}, {})", statementID, parameterIndex, x, cal);
preparedStatement.setTime(parameterIndex, x, cal);
}
@Override
public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException {
- logger.logf(level, "%s.setTimestamp(%d, %s, %s)", statementID, parameterIndex, x, cal);
+ logger.trace("{}.setTimestamp({}, {}, {})", statementID, parameterIndex, x, cal);
preparedStatement.setTimestamp(parameterIndex, x, cal);
}
@Override
public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {
- logger.logf(level, "%s.setNull(%d, %d, %s)", statementID, parameterIndex, sqlType, typeName);
+ logger.trace("{}.setNull({}, {}, {})", statementID, parameterIndex, sqlType, typeName);
preparedStatement.setNull(parameterIndex, sqlType, typeName);
}
@Override
public void setURL(int parameterIndex, URL x) throws SQLException {
- logger.logf(level, "%s.setURL(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setURL({}, {})", statementID, parameterIndex, x);
preparedStatement.setURL(parameterIndex, x);
}
@Override
public ParameterMetaData getParameterMetaData() throws SQLException {
ParameterMetaData x = preparedStatement.getParameterMetaData();
- logger.logf(level, "%s.getParameterMetaData() = %s", statementID, x);
+ logger.trace("{}.getParameterMetaData() = {}", statementID, x);
return x;
}
@Override
public void setRowId(int parameterIndex, RowId x) throws SQLException {
- logger.logf(level, "%s.setRowId(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setRowId({}, {})", statementID, parameterIndex, x);
preparedStatement.setRowId(parameterIndex, x);
}
@Override
public void setNString(int parameterIndex, String value) throws SQLException {
- logger.logf(level, "%s.setNString(%d, %s)", statementID, parameterIndex, value);
+ logger.trace("{}.setNString({}, {})", statementID, parameterIndex, value);
preparedStatement.setNString(parameterIndex, value);
}
@Override
public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
- logger.logf(level, "%s.setNCharacterStream(%d, %s, %d)", statementID, parameterIndex, value, length);
+ logger.trace("{}.setNCharacterStream({}, {}, {})", statementID, parameterIndex, value, length);
preparedStatement.setNCharacterStream(parameterIndex, value, length);
}
@Override
public void setNClob(int parameterIndex, NClob value) throws SQLException {
- logger.logf(level, "%s.setNClob(%d, %s)", statementID, parameterIndex, value);
+ logger.trace("{}.setNClob({}, {})", statementID, parameterIndex, value);
preparedStatement.setNClob(parameterIndex, value);
}
@Override
public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
- logger.logf(level, "%s.setClob(%d, %s, %s)", statementID, parameterIndex, reader, length);
+ logger.trace("{}.setClob({}, {}, {})", statementID, parameterIndex, reader, length);
preparedStatement.setClob(parameterIndex, reader, length);
}
@Override
public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
- logger.logf(level, "%s.setBlob(%d, %s, %d)", statementID, parameterIndex, inputStream, length);
+ logger.trace("{}.setBlob({}, {}, {})", statementID, parameterIndex, inputStream, length);
preparedStatement.setBlob(parameterIndex, inputStream, length);
}
@Override
public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
- logger.logf(level, "%s.setNClob(%d, %s, %d)", statementID, parameterIndex, reader, length);
+ logger.trace("{}.setNClob({}, {}, {})", statementID, parameterIndex, reader, length);
preparedStatement.setNClob(parameterIndex, reader, length);
}
@Override
public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
- logger.logf(level, "%s.setSQLXML(%d, %s)", statementID, parameterIndex, xmlObject);
+ logger.trace("{}.setSQLXML({}, {})", statementID, parameterIndex, xmlObject);
preparedStatement.setSQLXML(parameterIndex, xmlObject);
}
@Override
public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
- logger.logf(level, "%s.setNull(%d, %d)", statementID, parameterIndex, x);
+ logger.trace("{}.setNull({}, {})", statementID, parameterIndex, x);
preparedStatement.setObject(parameterIndex, x, targetSqlType, scaleOrLength);
}
@Override
public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
- logger.logf(level, "%s.setNull(%d, %d)", statementID, parameterIndex, x);
+ logger.trace("{}.setNull({}, {})", statementID, parameterIndex, x);
preparedStatement.setAsciiStream(parameterIndex, x, length);
}
@Override
public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
- logger.logf(level, "%s.setNull(%d, %d)", statementID, parameterIndex, x);
+ logger.trace("{}.setNull({}, {})", statementID, parameterIndex, x);
preparedStatement.setBinaryStream(parameterIndex, x, length);
}
@Override
public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
- logger.logf(level, "%s.setCharacterStream(%d, %s, %d)", statementID, parameterIndex, reader, length);
+ logger.trace("{}.setCharacterStream({}, {}, {})", statementID, parameterIndex, reader, length);
preparedStatement.setCharacterStream(parameterIndex, reader, length);
}
@Override
public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
- logger.logf(level, "%s.setAsciiStream(%d, %d)", statementID, parameterIndex, x);
+ logger.trace("{}.setAsciiStream({}, {})", statementID, parameterIndex, x);
preparedStatement.setAsciiStream(parameterIndex, x);
}
@Override
public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
- logger.logf(level, "%s.setBinaryStream(%d, %s)", statementID, parameterIndex, x);
+ logger.trace("{}.setBinaryStream({}, {})", statementID, parameterIndex, x);
preparedStatement.setBinaryStream(parameterIndex, x);
}
@Override
public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
- logger.logf(level, "%s.setCharacterStream(%d, %s)", statementID, parameterIndex, reader);
+ logger.trace("{}.setCharacterStream({}, {})", statementID, parameterIndex, reader);
preparedStatement.setCharacterStream(parameterIndex, reader);
}
@Override
public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
- logger.logf(level, "%s.setNCharacterStream(%d, %s)", statementID, parameterIndex, value);
+ logger.trace("{}.setNCharacterStream({}, {})", statementID, parameterIndex, value);
preparedStatement.setNCharacterStream(parameterIndex, value);
}
@Override
public void setClob(int parameterIndex, Reader reader) throws SQLException {
- logger.logf(level, "%s.setClob(%d, %s)", statementID, parameterIndex, reader);
+ logger.trace("{}.setClob({}, {})", statementID, parameterIndex, reader);
preparedStatement.setClob(parameterIndex, reader);
}
@Override
public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
- logger.logf(level, "%s.setBlob(%d, %s)", statementID, parameterIndex, inputStream);
+ logger.trace("{}.setBlob({}, {})", statementID, parameterIndex, inputStream);
preparedStatement.setBlob(parameterIndex, inputStream);
}
@Override
public void setNClob(int parameterIndex, Reader reader) throws SQLException {
- logger.logf(level, "%s.setNClob(%d, %s)", statementID, parameterIndex, reader);
+ logger.trace("{}.setNClob({}, {})", statementID, parameterIndex, reader);
preparedStatement.setNClob(parameterIndex, reader);
}
@Override
public void setObject(int parameterIndex, Object x, SQLType targetSqlType, int scaleOrLength) throws SQLException {
- logger.logf(level, "%s.setObject(%d, %s, %s, %d)", statementID, parameterIndex, x, targetSqlType, scaleOrLength);
+ logger.trace("{}.setObject({}, {}, {}, {})", statementID, parameterIndex, x, targetSqlType, scaleOrLength);
preparedStatement.setObject(parameterIndex, x, targetSqlType, scaleOrLength);
}
@Override
public void setObject(int parameterIndex, Object x, SQLType targetSqlType) throws SQLException {
- logger.logf(level, "%s.setObject(%d, %s, %d)", statementID, parameterIndex, x, targetSqlType);
+ logger.trace("{}.setObject({}, {}, {})", statementID, parameterIndex, x, targetSqlType);
preparedStatement.setObject(parameterIndex, x, targetSqlType);
}
@Override
public long executeLargeUpdate() throws SQLException {
long l = preparedStatement.executeLargeUpdate();
- logger.logf(level, "%s.executeLargeUpdate() = %s", statementID, l);
+ logger.trace("{}.executeLargeUpdate() = {}", statementID, l);
return l;
}
}
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingResultSet.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingResultSet.java
index 05dcac429c..ba27f674a6 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingResultSet.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingResultSet.java
@@ -41,7 +41,8 @@ import java.util.Arrays;
import java.util.Calendar;
import java.util.Map;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+
public class LoggingResultSet implements ResultSet {
@@ -51,8 +52,6 @@ public class LoggingResultSet implements ResultSet {
private final Logger logger;
- private static final Logger.Level level = Logger.Level.TRACE;
-
public LoggingResultSet(ResultSet resultSet, Logger logger) {
this.resultSet = resultSet;
this.logger = logger;
@@ -70,1234 +69,1234 @@ public class LoggingResultSet implements ResultSet {
@Override
public boolean next() throws SQLException {
boolean b = resultSet.next();
- logger.logf(level, "%s.next() = %s", resultSetID, b);
+ logger.trace("{}.next() = {}", resultSetID, b);
return b;
}
@Override
public void close() throws SQLException {
- logger.logf(level, "%s.close()", resultSetID);
+ logger.trace("{}.close()", resultSetID);
resultSet.close();
}
@Override
public boolean wasNull() throws SQLException {
boolean b = resultSet.wasNull();
- logger.logf(level, "%s.wasNull() = %s", resultSetID, b);
+ logger.trace("{}.wasNull() = {}", resultSetID, b);
return b;
}
@Override
public String getString(int columnIndex) throws SQLException {
String x = resultSet.getString(columnIndex);
- logger.logf(level, "%s.getString(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getString({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public boolean getBoolean(int columnIndex) throws SQLException {
boolean x = resultSet.getBoolean(columnIndex);
- logger.logf(level, "%s.getBoolean(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getBoolean({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public byte getByte(int columnIndex) throws SQLException {
byte x = resultSet.getByte(columnIndex);
- logger.logf(level, "%s.getByte(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getByte({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public short getShort(int columnIndex) throws SQLException {
short x = resultSet.getShort(columnIndex);
- logger.logf(level, "%s.getShort(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getShort({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public int getInt(int columnIndex) throws SQLException {
int x = resultSet.getInt(columnIndex);
- logger.logf(level, "%s.getInt(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getInt({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public long getLong(int columnIndex) throws SQLException {
long x = resultSet.getLong(columnIndex);
- logger.logf(level, "%s.getLong(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getLong({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public float getFloat(int columnIndex) throws SQLException {
float x = resultSet.getFloat(columnIndex);
- logger.logf(level, "%s.getFloat(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getFloat({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public double getDouble(int columnIndex) throws SQLException {
double x = resultSet.getDouble(columnIndex);
- logger.logf(level, "%s.getDouble(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getDouble({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
BigDecimal x = resultSet.getBigDecimal(columnIndex);
- logger.logf(level, "%s.getBigDecimal(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getBigDecimal({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public byte[] getBytes(int columnIndex) throws SQLException {
byte[] x = resultSet.getBytes(columnIndex);
- logger.logf(level, "%s.getBytes(%s) = %s", resultSetID, columnIndex, Arrays.toString(x));
+ logger.trace("{}.getBytes({}) = {}", resultSetID, columnIndex, Arrays.toString(x));
return x;
}
@Override
public Date getDate(int columnIndex) throws SQLException {
Date x = resultSet.getDate(columnIndex);
- logger.logf(level, "%s.getDate(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getDate({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public Time getTime(int columnIndex) throws SQLException {
Time x = resultSet.getTime(columnIndex);
- logger.logf(level, "%s.getTime(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getTime({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public Timestamp getTimestamp(int columnIndex) throws SQLException {
Timestamp x = resultSet.getTimestamp(columnIndex);
- logger.logf(level, "%s.getTimestamp(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getTimestamp({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public InputStream getAsciiStream(int columnIndex) throws SQLException {
InputStream x = resultSet.getAsciiStream(columnIndex);
- logger.logf(level, "%s.getAsciiStream(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getAsciiStream({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public InputStream getUnicodeStream(int columnIndex) throws SQLException {
InputStream x = resultSet.getUnicodeStream(columnIndex);
- logger.logf(level, "%s.getUnicodeStream(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getUnicodeStream({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public InputStream getBinaryStream(int columnIndex) throws SQLException {
InputStream x = resultSet.getBinaryStream(columnIndex);
- logger.logf(level, "%s.getBinaryStream(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getBinaryStream({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public String getString(String columnLabel) throws SQLException {
String x = resultSet.getString(columnLabel);
- logger.logf(level, "%s.getString(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getString({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public boolean getBoolean(String columnLabel) throws SQLException {
boolean x = resultSet.getBoolean(columnLabel);
- logger.logf(level, "%s.getBoolean(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getBoolean({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public byte getByte(String columnLabel) throws SQLException {
byte x = resultSet.getByte(columnLabel);
- logger.logf(level, "%s.getByte(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getByte({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public short getShort(String columnLabel) throws SQLException {
short x = resultSet.getShort(columnLabel);
- logger.logf(level, "%s.getShort(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getShort({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public int getInt(String columnLabel) throws SQLException {
int x = resultSet.getInt(columnLabel);
- logger.logf(level, "%s.getInt(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getInt({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public long getLong(String columnLabel) throws SQLException {
long x = resultSet.getLong(columnLabel);
- logger.logf(level, "%s.getLong(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getLong({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public float getFloat(String columnLabel) throws SQLException {
float x = resultSet.getFloat(columnLabel);
- logger.logf(level, "%s.getFloat(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getFloat({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public double getDouble(String columnLabel) throws SQLException {
double x = resultSet.getDouble(columnLabel);
- logger.logf(level, "%s.getDouble(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getDouble({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException {
BigDecimal x = resultSet.getBigDecimal(columnLabel);
- logger.logf(level, "%s.getBigDecimal(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getBigDecimal({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public byte[] getBytes(String columnLabel) throws SQLException {
byte[] x = resultSet.getBytes(columnLabel);
- logger.logf(level, "%s.getBytes(%s) = %s", resultSetID, columnLabel, Arrays.toString(x));
+ logger.trace("{}.getBytes({}) = {}", resultSetID, columnLabel, Arrays.toString(x));
return x;
}
@Override
public Date getDate(String columnLabel) throws SQLException {
Date x = resultSet.getDate(columnLabel);
- logger.logf(level, "%s.getDate(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getDate({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public Time getTime(String columnLabel) throws SQLException {
Time x = resultSet.getTime(columnLabel);
- logger.logf(level, "%s.getTime(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getTime({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public Timestamp getTimestamp(String columnLabel) throws SQLException {
Timestamp x = resultSet.getTimestamp(columnLabel);
- logger.logf(level, "%s.getTimestamp(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getTimestamp({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public InputStream getAsciiStream(String columnLabel) throws SQLException {
InputStream x = resultSet.getAsciiStream(columnLabel);
- logger.logf(level, "%s.getAsciiStream(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getAsciiStream({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public InputStream getUnicodeStream(String columnLabel) throws SQLException {
InputStream x = resultSet.getUnicodeStream(columnLabel);
- logger.logf(level, "%s.getUnicodeStream(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getUnicodeStream({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public InputStream getBinaryStream(String columnLabel) throws SQLException {
InputStream x = resultSet.getBinaryStream(columnLabel);
- logger.logf(level, "%s.getBinaryStream(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getBinaryStream({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public SQLWarning getWarnings() throws SQLException {
SQLWarning x = resultSet.getWarnings();
- logger.logf(level, "%s.getWarnings) = %s", resultSetID, x);
+ logger.trace("{}.getWarnings) = {}", resultSetID, x);
return x;
}
@Override
public void clearWarnings() throws SQLException {
- logger.logf(level, "%s.clearWarnings()", resultSetID);
+ logger.trace("{}.clearWarnings()", resultSetID);
resultSet.clearWarnings();
}
@Override
public String getCursorName() throws SQLException {
String x = resultSet.getCursorName();
- logger.logf(level, "%s.getCursorName() = %s", resultSetID, x);
+ logger.trace("{}.getCursorName() = {}", resultSetID, x);
return x;
}
@Override
public ResultSetMetaData getMetaData() throws SQLException {
ResultSetMetaData x = resultSet.getMetaData();
- logger.logf(level, "%s.getMetaData() = %s", resultSetID, x);
+ logger.trace("{}.getMetaData() = {}", resultSetID, x);
return x;
}
@Override
public Object getObject(int columnIndex) throws SQLException {
String x = resultSet.getString(columnIndex);
- logger.logf(level, "%s.getString(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getString({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public Object getObject(String columnLabel) throws SQLException {
Object x = resultSet.getObject(columnLabel);
- logger.logf(level, "%s.getObject(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getObject({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public int findColumn(String columnLabel) throws SQLException {
int x = resultSet.findColumn(columnLabel);
- logger.logf(level, "%s.findColumn(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.findColumn({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public Reader getCharacterStream(int columnIndex) throws SQLException {
Reader x = resultSet.getCharacterStream(columnIndex);
- logger.logf(level, "%s.getCharacterStream(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getCharacterStream({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public Reader getCharacterStream(String columnLabel) throws SQLException {
Reader x = resultSet.getCharacterStream(columnLabel);
- logger.logf(level, "%s.getCharacterStream(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getCharacterStream({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
BigDecimal x = resultSet.getBigDecimal(columnIndex);
- logger.logf(level, "%s.getBigDecimal(%s) = %s", resultSetID, columnIndex, x);
+ logger.trace("{}.getBigDecimal({}) = {}", resultSetID, columnIndex, x);
return x;
}
@Override
public BigDecimal getBigDecimal(String columnLabel) throws SQLException {
BigDecimal x = resultSet.getBigDecimal(columnLabel);
- logger.logf(level, "%s.getBigDecimal(%s) = %s", resultSetID, columnLabel, x);
+ logger.trace("{}.getBigDecimal({}) = {}", resultSetID, columnLabel, x);
return x;
}
@Override
public boolean isBeforeFirst() throws SQLException {
boolean x = resultSet.isBeforeFirst();
- logger.logf(level, "%s.isBeforeFirst() = %s", resultSetID, x);
+ logger.trace("{}.isBeforeFirst() = {}", resultSetID, x);
return x;
}
@Override
public boolean isAfterLast() throws SQLException {
boolean x = resultSet.isAfterLast();
- logger.logf(level, "%s.isAfterLast() = %s", resultSetID, x);
+ logger.trace("{}.isAfterLast() = {}", resultSetID, x);
return x;
}
@Override
public boolean isFirst() throws SQLException {
boolean x = resultSet.isFirst();
- logger.logf(level, "%s.isFirst() = %s", resultSetID, x);
+ logger.trace("{}.isFirst() = {}", resultSetID, x);
return x;
}
@Override
public boolean isLast() throws SQLException {
boolean x = resultSet.isLast();
- logger.logf(level, "%s.isLast() = %s", resultSetID, x);
+ logger.trace("{}.isLast() = {}", resultSetID, x);
return x;
}
@Override
public void beforeFirst() throws SQLException {
- logger.logf(level, "%s.beforeFirst()", resultSetID);
+ logger.trace("{}.beforeFirst()", resultSetID);
resultSet.beforeFirst();
}
@Override
public void afterLast() throws SQLException {
- logger.logf(level, "%s.afterLast()", resultSetID);
+ logger.trace("{}.afterLast()", resultSetID);
resultSet.afterLast();
}
@Override
public boolean first() throws SQLException {
boolean x = resultSet.first();
- logger.logf(level, "%s.first() = %s", resultSetID, x);
+ logger.trace("{}.first() = {}", resultSetID, x);
return x;
}
@Override
public boolean last() throws SQLException {
boolean x = resultSet.last();
- logger.logf(level, "%s.last() = %s", resultSetID, x);
+ logger.trace("{}.last() = {}", resultSetID, x);
return x;
}
@Override
public int getRow() throws SQLException {
int x = resultSet.getRow();
- logger.logf(level, "%s.getRow() = %s", resultSetID, x);
+ logger.trace("{}.getRow() = {}", resultSetID, x);
return x;
}
@Override
public boolean absolute(int row) throws SQLException {
boolean x = resultSet.absolute(row);
- logger.logf(level, "%s.absolute(%s) = %s", resultSetID, row, x);
+ logger.trace("{}.absolute({}) = {}", resultSetID, row, x);
return x;
}
@Override
public boolean relative(int rows) throws SQLException {
boolean x = resultSet.relative(rows);
- logger.logf(level, "%s.relative(%s) = %s", resultSetID, rows, x);
+ logger.trace("{}.relative({}) = {}", resultSetID, rows, x);
return x;
}
@Override
public boolean previous() throws SQLException {
boolean x = resultSet.previous();
- logger.logf(level, "%s.previous() = %s", resultSetID, x);
+ logger.trace("{}.previous() = {}", resultSetID, x);
return x;
}
@Override
public void setFetchDirection(int direction) throws SQLException {
- logger.logf(level, "%s.setFetchDirection(%s)", resultSetID, direction);
+ logger.trace("{}.setFetchDirection({})", resultSetID, direction);
resultSet.setFetchDirection(direction);
}
@Override
public int getFetchDirection() throws SQLException {
int x = resultSet.getFetchDirection();
- logger.logf(level, "%s.getFetchDirection() = %s", resultSetID, x);
+ logger.trace("{}.getFetchDirection() = {}", resultSetID, x);
return x;
}
@Override
public void setFetchSize(int rows) throws SQLException {
- logger.logf(level, "%s.setFetchSize(%s)", resultSetID, rows);
+ logger.trace("{}.setFetchSize({})", resultSetID, rows);
resultSet.setFetchSize(rows);
}
@Override
public int getFetchSize() throws SQLException {
int x = resultSet.getFetchSize();
- logger.logf(level, "%s.getFetchSize() = %s", resultSetID, x);
+ logger.trace("{}.getFetchSize() = {}", resultSetID, x);
return x;
}
@Override
public int getType() throws SQLException {
int x = resultSet.getType();
- logger.logf(level, "%s.getType() = %s", resultSetID, x);
+ logger.trace("{}.getType() = {}", resultSetID, x);
return x;
}
@Override
public int getConcurrency() throws SQLException {
int x = resultSet.getConcurrency();
- logger.logf(level, "%s.getConcurrency() = %s", resultSetID, x);
+ logger.trace("{}.getConcurrency() = {}", resultSetID, x);
return x;
}
@Override
public boolean rowUpdated() throws SQLException {
boolean x = resultSet.rowUpdated();
- logger.logf(level, "%s.rowUpdated() = %s", resultSetID, x);
+ logger.trace("{}.rowUpdated() = {}", resultSetID, x);
return x;
}
@Override
public boolean rowInserted() throws SQLException {
boolean x = resultSet.rowInserted();
- logger.logf(level, "%s.rowInserted() = %s", resultSetID, x);
+ logger.trace("{}.rowInserted() = {}", resultSetID, x);
return x;
}
@Override
public boolean rowDeleted() throws SQLException {
boolean x = resultSet.rowDeleted();
- logger.logf(level, "%s.rowDeleted() = %s", resultSetID, x);
+ logger.trace("{}.rowDeleted() = {}", resultSetID, x);
return x;
}
@Override
public void updateNull(int columnIndex) throws SQLException {
- logger.logf(level, "%s.updateNull(%s)", resultSetID, columnIndex);
+ logger.trace("{}.updateNull({})", resultSetID, columnIndex);
resultSet.updateNull(columnIndex);
}
@Override
public void updateBoolean(int columnIndex, boolean x) throws SQLException {
- logger.logf(level, "%s.updateBoolean(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateBoolean({}, {})", resultSetID, columnIndex, x);
resultSet.updateBoolean(columnIndex, x);
}
@Override
public void updateByte(int columnIndex, byte x) throws SQLException {
- logger.logf(level, "%s.updateByte(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateByte({}, {})", resultSetID, columnIndex, x);
resultSet.updateByte(columnIndex, x);
}
@Override
public void updateShort(int columnIndex, short x) throws SQLException {
- logger.logf(level, "%s.updateShort(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateShort({}, {})", resultSetID, columnIndex, x);
resultSet.updateShort(columnIndex, x);
}
@Override
public void updateInt(int columnIndex, int x) throws SQLException {
- logger.logf(level, "%s.updateInt(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateInt({}, {})", resultSetID, columnIndex, x);
resultSet.updateInt(columnIndex, x);
}
@Override
public void updateLong(int columnIndex, long x) throws SQLException {
- logger.logf(level, "%s.updateLong(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateLong({}, {})", resultSetID, columnIndex, x);
resultSet.updateLong(columnIndex, x);
}
@Override
public void updateFloat(int columnIndex, float x) throws SQLException {
- logger.logf(level, "%s.updateFloat(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateFloat({}, {})", resultSetID, columnIndex, x);
resultSet.updateFloat(columnIndex, x);
}
@Override
public void updateDouble(int columnIndex, double x) throws SQLException {
- logger.logf(level, "%s.updateDouble(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateDouble({}, {})", resultSetID, columnIndex, x);
resultSet.updateDouble(columnIndex, x);
}
@Override
public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
- logger.logf(level, "%s.updateBigDecimal(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateBigDecimal({}, {})", resultSetID, columnIndex, x);
resultSet.updateBigDecimal(columnIndex, x);
}
@Override
public void updateString(int columnIndex, String x) throws SQLException {
- logger.logf(level, "%s.updateString(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateString({}, {})", resultSetID, columnIndex, x);
resultSet.updateString(columnIndex, x);
}
@Override
public void updateBytes(int columnIndex, byte[] x) throws SQLException {
- logger.logf(level, "%s.updateBytes(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateBytes({}, {})", resultSetID, columnIndex, x);
resultSet.updateBytes(columnIndex, x);
}
@Override
public void updateDate(int columnIndex, Date x) throws SQLException {
- logger.logf(level, "%s.updateDate(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateDate({}, {})", resultSetID, columnIndex, x);
resultSet.updateDate(columnIndex, x);
}
@Override
public void updateTime(int columnIndex, Time x) throws SQLException {
- logger.logf(level, "%s.updateTime(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateTime({}, {})", resultSetID, columnIndex, x);
resultSet.updateTime(columnIndex, x);
}
@Override
public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
- logger.logf(level, "%s.updateTimestamp(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateTimestamp({}, {})", resultSetID, columnIndex, x);
resultSet.updateTimestamp(columnIndex, x);
}
@Override
public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
- logger.logf(level, "%s.updateAsciiStream(%s, %s, %s)", resultSetID, columnIndex, x, length);
+ logger.trace("{}.updateAsciiStream({}, {}, {})", resultSetID, columnIndex, x, length);
resultSet.updateAsciiStream(columnIndex, x, length);
}
@Override
public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
- logger.logf(level, "%s.updateBinaryStream(%s, %s, %s)", resultSetID, columnIndex, x, length);
+ logger.trace("{}.updateBinaryStream({}, {}, {})", resultSetID, columnIndex, x, length);
resultSet.updateBinaryStream(columnIndex, x, length);
}
@Override
public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
- logger.logf(level, "%s.updateCharacterStream(%s, %s, %s)", resultSetID, columnIndex, x, length);
+ logger.trace("{}.updateCharacterStream({}, {}, {})", resultSetID, columnIndex, x, length);
resultSet.updateCharacterStream(columnIndex, x, length);
}
@Override
public void updateObject(int columnIndex, Object x, int scaleOrLength) throws SQLException {
- logger.logf(level, "%s.updateObject(%s, %s, %s)", resultSetID, columnIndex, x, scaleOrLength);
+ logger.trace("{}.updateObject({}, {}, {})", resultSetID, columnIndex, x, scaleOrLength);
resultSet.updateObject(columnIndex, x, scaleOrLength);
}
@Override
public void updateObject(int columnIndex, Object x) throws SQLException {
- logger.logf(level, "%s.updateObject(%s, %s)", resultSetID, columnIndex, x);
+ logger.trace("{}.updateObject({}, {})", resultSetID, columnIndex, x);
resultSet.updateObject(columnIndex, x);
}
@Override
public void updateNull(String columnLabel) throws SQLException {
- logger.logf(level, "%s.updateNull(%s)", resultSetID, columnLabel);
+ logger.trace("{}.updateNull({})", resultSetID, columnLabel);
resultSet.updateNull(columnLabel);
}
@Override
public void updateBoolean(String columnLabel, boolean x) throws SQLException {
- logger.logf(level, "%s.updateBoolean(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateBoolean({}, {})", resultSetID, columnLabel, x);
resultSet.updateBoolean(columnLabel, x);
}
@Override
public void updateByte(String columnLabel, byte x) throws SQLException {
- logger.logf(level, "%s.updateByte(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateByte({}, {})", resultSetID, columnLabel, x);
resultSet.updateByte(columnLabel, x);
}
@Override
public void updateShort(String columnLabel, short x) throws SQLException {
- logger.logf(level, "%s.updateShort(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateShort({}, {})", resultSetID, columnLabel, x);
resultSet.updateShort(columnLabel, x);
}
@Override
public void updateInt(String columnLabel, int x) throws SQLException {
- logger.logf(level, "%s.updateInt(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateInt({}, {})", resultSetID, columnLabel, x);
resultSet.updateInt(columnLabel, x);
}
@Override
public void updateLong(String columnLabel, long x) throws SQLException {
- logger.logf(level, "%s.updateLong(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateLong({}, {})", resultSetID, columnLabel, x);
resultSet.updateLong(columnLabel, x);
}
@Override
public void updateFloat(String columnLabel, float x) throws SQLException {
- logger.logf(level, "%s.updateFloat(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateFloat({}, {})", resultSetID, columnLabel, x);
resultSet.updateFloat(columnLabel, x);
}
@Override
public void updateDouble(String columnLabel, double x) throws SQLException {
- logger.logf(level, "%s.updateDouble(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateDouble({}, {})", resultSetID, columnLabel, x);
resultSet.updateDouble(columnLabel, x);
}
@Override
public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException {
- logger.logf(level, "%s.updateBigDecimal(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateBigDecimal({}, {})", resultSetID, columnLabel, x);
resultSet.updateBigDecimal(columnLabel, x);
}
@Override
public void updateString(String columnLabel, String x) throws SQLException {
- logger.logf(level, "%s.updateString(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateString({}, {})", resultSetID, columnLabel, x);
resultSet.updateString(columnLabel, x);
}
@Override
public void updateBytes(String columnLabel, byte[] x) throws SQLException {
- logger.logf(level, "%s.updateBytes(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateBytes({}, {})", resultSetID, columnLabel, x);
resultSet.updateBytes(columnLabel, x);
}
@Override
public void updateDate(String columnLabel, Date x) throws SQLException {
- logger.logf(level, "%s.updateDate(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateDate({}, {})", resultSetID, columnLabel, x);
resultSet.updateDate(columnLabel, x);
}
@Override
public void updateTime(String columnLabel, Time x) throws SQLException {
- logger.logf(level, "%s.updateTime(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateTime({}, {})", resultSetID, columnLabel, x);
resultSet.updateTime(columnLabel, x);
}
@Override
public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException {
- logger.logf(level, "%s.updateTimestamp(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateTimestamp({}, {})", resultSetID, columnLabel, x);
resultSet.updateTimestamp(columnLabel, x);
}
@Override
public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException {
- logger.logf(level, "%s.updateAsciiStream(%s, %s, %s)", resultSetID, columnLabel, x, length);
+ logger.trace("{}.updateAsciiStream({}, {}, {})", resultSetID, columnLabel, x, length);
resultSet.updateAsciiStream(columnLabel, x, length);
}
@Override
public void updateBinaryStream(String columnLabel, InputStream x, int length) throws SQLException {
- logger.logf(level, "%s.updateBinaryStream(%s, %s, %s)", resultSetID, columnLabel, x, length);
+ logger.trace("{}.updateBinaryStream({}, {}, {})", resultSetID, columnLabel, x, length);
resultSet.updateBinaryStream(columnLabel, x, length);
}
@Override
public void updateCharacterStream(String columnLabel, Reader x, int length) throws SQLException {
- logger.logf(level, "%s.updateCharacterStream(%s, %s, %s)", resultSetID, columnLabel, x, length);
+ logger.trace("{}.updateCharacterStream({}, {}, {})", resultSetID, columnLabel, x, length);
resultSet.updateCharacterStream(columnLabel, x, length);
}
@Override
public void updateObject(String columnLabel, Object x, int scaleOrLength) throws SQLException {
- logger.logf(level, "%s.updateObject(%s, %s, %s)", resultSetID, columnLabel, x, scaleOrLength);
+ logger.trace("{}.updateObject({}, {}, {})", resultSetID, columnLabel, x, scaleOrLength);
resultSet.updateObject(columnLabel, x, scaleOrLength);
}
@Override
public void updateObject(String columnLabel, Object x) throws SQLException {
- logger.logf(level, "%s.updateObject(%s, %s)", resultSetID, columnLabel, x);
+ logger.trace("{}.updateObject({}, {})", resultSetID, columnLabel, x);
resultSet.updateObject(columnLabel, x);
}
@Override
public void insertRow() throws SQLException {
- logger.logf(level, "%s.insertRow()", resultSetID);
+ logger.trace("{}.insertRow()", resultSetID);
resultSet.insertRow();
}
@Override
public void updateRow() throws SQLException {
- logger.logf(level, "%s.updateRow()", resultSetID);
+ logger.trace("{}.updateRow()", resultSetID);
resultSet.updateRow();
}
@Override
public void deleteRow() throws SQLException {
- logger.logf(level, "%s.deleteRow()", resultSetID);
+ logger.trace("{}.deleteRow()", resultSetID);
resultSet.deleteRow();
}
@Override
public void refreshRow() throws SQLException {
- logger.logf(level, "%s.refreshRow()", resultSetID);
+ logger.trace("{}.refreshRow()", resultSetID);
resultSet.refreshRow();
}
@Override
public void cancelRowUpdates() throws SQLException {
- logger.logf(level, "%s.cancelRowUpdates()", resultSetID);
+ logger.trace("{}.cancelRowUpdates()", resultSetID);
... 31312 lines suppressed ...
[activemq-artemis] 04/42: basic logging config and some more on AssertionLoggerHandler to get some tests using it working
Posted by cl...@apache.org.
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 5027f276b61dbdb9886d34ef328d81e51593cd2f
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 11 16:15:14 2022 +0100
basic logging config and some more on AssertionLoggerHandler to get some tests using it working
---
.../artemis/logs/AssertionLoggerHandler.java | 51 ++++++++++++++--------
pom.xml | 6 ++-
tests/config/log4j2-tests-config-CI.properties | 38 ++++++++++++++++
tests/config/log4j2-tests-config.properties | 32 ++++++++++++++
4 files changed, 108 insertions(+), 19 deletions(-)
diff --git a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
index 4bb25932f2..269745e4d5 100644
--- a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
+++ b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
@@ -29,6 +29,8 @@ import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.Property;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
/**
* This class contains a tool where programs could intercept for LogMessage given an interval of time between {@link #startCapture()}
@@ -36,29 +38,25 @@ import org.apache.logging.log4j.core.config.Property;
*
* Be careful with this use as this is intended for testing only (such as testcases)
*/
-public class AssertionLoggerHandler extends AbstractAppender {
-
- public enum LogLevel {
- ERROR(Level.ERROR),
- WARN(Level.WARN),
- INFO(Level.INFO),
- DEBUG(Level.DEBUG),
- TRACE(Level.TRACE);
- Level implLevel;
+@Plugin(name = "AssertionLoggerHandler", category = "Core", elementType = "appender")
+public class AssertionLoggerHandler extends AbstractAppender {
- private LogLevel(Level implLevel) {
- this.implLevel = implLevel;
- }
+ private static final Map<String, LogEvent> messages = new ConcurrentHashMap<>();
+ private static List<String> traceMessages;
+ private static volatile boolean capture = false;
- private Level toImplLevel() {
- return implLevel;
+ public static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B> implements org.apache.logging.log4j.core.util.Builder<AssertionLoggerHandler> {
+ @Override
+ public AssertionLoggerHandler build() {
+ return new AssertionLoggerHandler(getName(), getFilter(), getOrCreateLayout(), isIgnoreExceptions(), getPropertyArray());
}
}
- private static final Map<String, LogEvent> messages = new ConcurrentHashMap<>();
- private static List<String> traceMessages;
- private static volatile boolean capture = false;
+ @PluginBuilderFactory
+ public static <B extends Builder<B>> B newBuilder() {
+ return new Builder<B>().asBuilder();
+ }
protected AssertionLoggerHandler(String name, Filter filter, Layout<? extends Serializable> layout, boolean ignoreExceptions, Property[] properties) {
super(name, filter, layout, ignoreExceptions, properties);
@@ -221,4 +219,23 @@ public class AssertionLoggerHandler extends AbstractAppender {
clear();
traceMessages = null;
}
+
+ public enum LogLevel {
+ ERROR(Level.ERROR),
+ WARN(Level.WARN),
+ INFO(Level.INFO),
+ DEBUG(Level.DEBUG),
+ TRACE(Level.TRACE);
+
+ Level implLevel;
+
+ LogLevel(Level implLevel) {
+ this.implLevel = implLevel;
+ }
+
+ private Level toImplLevel() {
+ return implLevel;
+ }
+ }
+
}
diff --git a/pom.xml b/pom.xml
index 6db78e33fe..fb9db8a07c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
<retryTests>false</retryTests>
- <logging.config>logging.properties</logging.config>
+ <logging.config>log4j2-tests-config.properties</logging.config>
<modular.jdk.surefire.arg>--add-modules java.sql,jdk.unsupported </modular.jdk.surefire.arg>
<activemq-artemis-native-version>2.0.0-SNAPSHOT</activemq-artemis-native-version>
@@ -235,6 +235,7 @@
-Djava.library.path="${activemq.basedir}/target/bin/lib/linux-x86_64:${activemq.basedir}/target/bin/lib/linux-i686" -Djgroups.bind_addr=localhost
-Djava.net.preferIPv4Stack=true -Dbasedir=${basedir}
-Djdk.attach.allowAttachSelf=true
+ -Dlog4j2.configurationFile="file:${activemq.basedir}/tests/config/${logging.config}"
</activemq-surefire-argline>
<activemq.basedir>${project.basedir}</activemq.basedir>
<skipOWASP>true</skipOWASP>
@@ -1286,7 +1287,7 @@
<id>tests-CI</id>
<properties>
<!-- notice I did not intend to use retryTests on this profile, as this will be optional depending on where you run the tests -->
- <logging.config>logging-CI.properties</logging.config>
+ <logging.config>log4j2-tests-config-CI.properties</logging.config>
</properties>
</profile>
<profile>
@@ -1349,6 +1350,7 @@
<jacoco.agent />
<activemq-surefire-argline>
+ -Dlog4j2.configurationFile="file:${activemq.basedir}/tests/config/${logging.config}"
-Djava.library.path="${activemq.basedir}/activemq-artemis-native/bin" -Djgroups.bind_addr=localhost -Dorg.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory.localBindAddress=localhost
-Djava.net.preferIPv4Stack=true -Dbasedir=${basedir}
@{jacoco.agent} -Djacoco.agent=@{jacoco.agent}
diff --git a/tests/config/log4j2-tests-config-CI.properties b/tests/config/log4j2-tests-config-CI.properties
new file mode 100644
index 0000000000..4ecac73492
--- /dev/null
+++ b/tests/config/log4j2-tests-config-CI.properties
@@ -0,0 +1,38 @@
+# 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.
+
+# Log4J 2 configuration used in tests in CI
+rootLogger = INFO, Console, Test
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+# quorum logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=WARN
+
+# Console appender
+appender.console.type=Console
+appender.console.name=Console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
+
+# Test appender org.apache.activemq.artemis.logs.AssertionLoggerHandler
+appender.test.type=AssertionLoggerHandler
+appender.test.name=Test
+appender.test.layout.type=PatternLayout
+appender.test.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
diff --git a/tests/config/log4j2-tests-config.properties b/tests/config/log4j2-tests-config.properties
new file mode 100644
index 0000000000..b6dc034c43
--- /dev/null
+++ b/tests/config/log4j2-tests-config.properties
@@ -0,0 +1,32 @@
+# 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.
+
+# Log4J 2 configuration used in tests.
+rootLogger = INFO, Console, Test
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+# Console appender
+appender.console.type=Console
+appender.console.name=Console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
+
+# Test appender org.apache.activemq.artemis.logs.AssertionLoggerHandler
+appender.test.type=AssertionLoggerHandler
+appender.test.name=Test
+appender.test.layout.type=PatternLayout
+appender.test.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
[activemq-artemis] 11/42: make a start on a basic loging config for distribution
Posted by cl...@apache.org.
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 38f28c48dd15c433e482f1ebc0d2fcbe9c7ef652
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Jul 13 18:36:41 2022 +0100
make a start on a basic loging config for distribution
---
.../activemq/artemis/cli/commands/Create.java | 2 +-
.../activemq/artemis/cli/commands/bin/artemis | 6 ++--
.../activemq/artemis/cli/commands/bin/artemis.cmd | 6 ++--
.../cli/commands/etc/log4j2-config.properties | 37 ++++++++++++++++++++++
4 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index ea9e741289..a1ff0d2ece 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -82,7 +82,7 @@ public class Create extends InputAbstract {
public static final String BIN_ARTEMIS = "bin/artemis";
public static final String BIN_ARTEMIS_SERVICE = "bin/artemis-service";
public static final String ETC_ARTEMIS_PROFILE = "artemis.profile";
- public static final String ETC_LOGGING_PROPERTIES = "logging.properties";
+ public static final String ETC_LOGGING_PROPERTIES = "log4j2-config.properties";
public static final String ETC_BOOTSTRAP_XML = "bootstrap.xml";
public static final String ETC_MANAGEMENT_XML = "management.xml";
public static final String ETC_BROKER_XML = "broker.xml";
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index 4f8e2f3b66..5d8a2a3477 100755
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -51,8 +51,7 @@ ARTEMIS_INSTANCE_ETC='${artemis.instance.etc}'
. "$ARTEMIS_INSTANCE_ETC/artemis.profile"
# Set Defaults Properties
-ARTEMIS_LOGGING_CONF="$ARTEMIS_INSTANCE_ETC_URI/logging.properties"
-ARTEMIS_LOG_MANAGER=org.jboss.logmanager.LogManager
+ARTEMIS_LOGGING_CONF="$ARTEMIS_INSTANCE_ETC_URI/log4j2-config.properties"
CLASSPATH="$ARTEMIS_HOME/lib/artemis-boot.jar"
@@ -132,8 +131,7 @@ exec "$JAVACMD" \
-Djava.io.tmpdir="$ARTEMIS_INSTANCE/tmp" \
-Ddata.dir="$ARTEMIS_DATA_DIR" \
-Dartemis.instance.etc="$ARTEMIS_INSTANCE_ETC" \
- -Djava.util.logging.manager="$ARTEMIS_LOG_MANAGER" \
- -Dlogging.configuration="$ARTEMIS_LOGGING_CONF" \
+ -Dlog4j2.configurationFile="$ARTEMIS_LOGGING_CONF" \
-Dartemis.default.sensitive.string.codec.key="$ARTEMIS_DEFAULT_SENSITIVE_STRING_CODEC_KEY" \
$DEBUG_ARGS \
org.apache.activemq.artemis.boot.Artemis "$@"
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
index 2d39231708..a403ffaa3a 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
@@ -49,8 +49,7 @@ set ARTEMIS_INSTANCE_ETC="${artemis.instance.etc}"
call %ARTEMIS_INSTANCE_ETC%\artemis.profile.cmd %*
rem "Set Defaults."
-set ARTEMIS_LOGGING_CONF=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties
-set ARTEMIS_LOG_MANAGER=org.jboss.logmanager.LogManager
+set ARTEMIS_LOGGING_CONF=%ARTEMIS_INSTANCE_ETC_URI%/log4j2-config.properties
if not exist "%ARTEMIS_OOME_DUMP%" goto NO_ARTEMIS_OOME_DUMP
rem "Backup the last OOME heap dump"
@@ -66,8 +65,7 @@ set JVM_ARGS=%JVM_ARGS% -Dartemis.home=%ARTEMIS_HOME%
set JVM_ARGS=%JVM_ARGS% -Dartemis.instance=%ARTEMIS_INSTANCE%
set JVM_ARGS=%JVM_ARGS% -Ddata.dir=%ARTEMIS_DATA_DIR%
set JVM_ARGS=%JVM_ARGS% -Dartemis.instance.etc=%ARTEMIS_INSTANCE_ETC%
-set JVM_ARGS=%JVM_ARGS% -Djava.util.logging.manager=%ARTEMIS_LOG_MANAGER%
-set JVM_ARGS=%JVM_ARGS% -Dlogging.configuration=%ARTEMIS_LOGGING_CONF%
+set JVM_ARGS=%JVM_ARGS% -Dlog4j2.configurationFile=%ARTEMIS_LOGGING_CONF%
set JVM_ARGS=%JVM_ARGS% -Dartemis.default.sensitive.string.codec.key=%ARTEMIS_DEFAULT_SENSITIVE_STRING_CODEC_KEY%
if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS%
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
new file mode 100644
index 0000000000..32ba2f9680
--- /dev/null
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
@@ -0,0 +1,37 @@
+# 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.
+
+# Log4J 2 configuration
+rootLogger = INFO, Console
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+# Audit logger:
+logger.audit.name=org.apache.activemq.audit
+logger.audit.level=INFO
+#TODO: copy specific audit loggers config
+
+# quorum logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=ERROR
+
+# Console appender
+appender.console.type=Console
+appender.console.name=Console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
[activemq-artemis] 21/42: reorder args to match previously out-of-order placeholders, ensure new output matches previous
Posted by cl...@apache.org.
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 0bd386a7c0bfab12dc7a0e95c387077ead9b476e
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 15 13:56:32 2022 +0100
reorder args to match previously out-of-order placeholders, ensure new output matches previous
---
.../src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java | 4 ++--
1 file changed, 2 insertions(+), 2 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 0a400e978d..9dae59cf7d 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
@@ -2341,11 +2341,11 @@ public interface AuditLogger {
void sendMessageFailure(String user, String queueName, String sendUser);
static void browseMessagesSuccess(String queueName, int numMessages) {
- RESOURCE_LOGGER.browseMessagesSuccess(getCaller(), queueName, numMessages);
+ RESOURCE_LOGGER.browseMessagesSuccess(getCaller(), numMessages, queueName);
}
@LogMessage(id = 601725, value = "User {} browsed {} messages from queue {}", level = LogMessage.Level.INFO)
- void browseMessagesSuccess(String user, String queueName, int numMessages);
+ void browseMessagesSuccess(String user, int numMessages, String queueName);
static void browseMessagesFailure(String queueName) {
RESOURCE_LOGGER.browseMessagesFailure(getCaller(), queueName);
[activemq-artemis] 05/42: add commons-logging -> SLF4J bridge and exclude commons-logging, suppresses unconfigured log spam from beanutils etc
Posted by cl...@apache.org.
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 a120f1b2ff9eebb7eca9753d5a1d883552645a5d
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 11 16:16:43 2022 +0100
add commons-logging -> SLF4J bridge and exclude commons-logging, suppresses unconfigured log spam from beanutils etc
---
artemis-commons/pom.xml | 5 +++++
artemis-jdbc-store/pom.xml | 5 +++++
artemis-rest/pom.xml | 5 +++++
artemis-server/pom.xml | 5 +++++
pom.xml | 42 ++++++++++++++++++++++++++++++++----------
5 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
index 5aaa2c2294..d96f8c2137 100644
--- a/artemis-commons/pom.xml
+++ b/artemis-commons/pom.xml
@@ -92,6 +92,11 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
+ <dependency>
+ <!-- Needed to replace commons-logging for commons-beanutils -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/artemis-jdbc-store/pom.xml b/artemis-jdbc-store/pom.xml
index ce7c70a5c2..ee4f221609 100644
--- a/artemis-jdbc-store/pom.xml
+++ b/artemis-jdbc-store/pom.xml
@@ -64,6 +64,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
</dependency>
+ <dependency>
+ <!-- Needed to replace commons-logging for commons-dbcp2 -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<!-- Database driver support -->
<dependency>
diff --git a/artemis-rest/pom.xml b/artemis-rest/pom.xml
index 1c33dcef97..2ce86c5136 100644
--- a/artemis-rest/pom.xml
+++ b/artemis-rest/pom.xml
@@ -149,6 +149,11 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
+ <dependency>
+ <!-- Needed to replace commons-logging for httpclient -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index 6a5b477d5e..f69a8e3c06 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -158,6 +158,11 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
+ <dependency>
+ <!-- Needed to replace commons-logging for commons-beanutils -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
diff --git a/pom.xml b/pom.xml
index fb9db8a07c..89949a466c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,10 +498,16 @@
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>${commons.config.version}</version>
- <!-- License: Apache 2.0 -->
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>${commons.config.version}</version>
+ <!-- License: Apache 2.0 -->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -789,14 +795,18 @@
<artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
<!-- License: Apache 2.0 -->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
- <!-- needed by commons-beanutils-->
+ <!-- needed to replace commons-logging for commons-beanutils etc -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- <!-- License: Apache 2.0 -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<!-- needed by artemis-selector -->
@@ -822,6 +832,12 @@
<artifactId>commons-dbcp2</artifactId>
<version>${commons.dbcp2.version}</version>
<!-- license Apache 2 -->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- used by commons-dbcp2 -->
<dependency>
@@ -1070,6 +1086,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${apache.httpclient.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
[activemq-artemis] 16/42: add TODO for another fun task
Posted by cl...@apache.org.
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 f42775a596673210ce0aca0f28f3a9e130dc4ca0
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jul 14 17:06:00 2022 +0100
add TODO for another fun task
---
.../org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
index 5eb3b4d81e..338cb5e397 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
@@ -91,6 +91,7 @@ public interface ActiveMQMessageBundle {
@Message(id = 229005, value = "connections for {} closed by management")
ActiveMQInternalErrorException connectionsClosedByManagement(String ipAddress);
+ // TODO: replace now-unecessary '' escapes in messages with just ', throughout the codebase...in order to maintain prior output, and make the code seem less whack :/
@Message(id = 229006, value = "journals are not JournalImpl. You can''t set a replicator!")
ActiveMQInternalErrorException notJournalImpl();
[activemq-artemis] 32/42: Removing @Cause annotation
Posted by cl...@apache.org.
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 9ac5943404984bf73693411c3cab4ae90231f955
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Thu Jul 21 11:52:03 2022 -0400
Removing @Cause annotation
---
.../activemq/artemis/logs/ActiveMQUtilBundle.java | 3 +-
.../activemq/artemis/logs/ActiveMQUtilLogger.java | 21 +-
.../apache/activemq/artemis/logs/AuditLogger.java | 3 +-
.../artemis/core/client/ActiveMQClientLogger.java | 119 ++++---
.../core/client/ActiveMQClientMessageBundle.java | 21 +-
.../jms/client/ActiveMQJMSClientBundle.java | 3 +-
.../jms/client/ActiveMQJMSClientLogger.java | 17 +-
.../jms/bridge/ActiveMQJMSBridgeLogger.java | 11 +-
.../jms/server/ActiveMQJMSServerBundle.java | 3 +-
.../jms/server/ActiveMQJMSServerLogger.java | 17 +-
.../artemis/journal/ActiveMQJournalLogger.java | 39 ++-
.../artemis/logprocessor/annotation/Cause.java | 30 --
.../artemis/core/protocol/mqtt/MQTTLogger.java | 17 +-
.../stomp/ActiveMQStompProtocolLogger.java | 3 +-
.../stomp/ActiveMQStompProtocolMessageBundle.java | 19 +-
.../activemq/artemis/ra/ActiveMQRABundle.java | 3 +-
.../activemq/artemis/ra/ActiveMQRALogger.java | 27 +-
.../activemq/artemis/rest/ActiveMQRestLogger.java | 11 +-
.../activemq/artemis/osgi/ActiveMQOsgiLogger.java | 7 +-
.../artemis/core/server/ActiveMQMessageBundle.java | 11 +-
.../artemis/core/server/ActiveMQServerLogger.java | 361 ++++++++++-----------
.../xa/recovery/ActiveMQXARecoveryLogger.java | 17 +-
22 files changed, 356 insertions(+), 407 deletions(-)
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
index a04c138e97..4c4de7882a 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
@@ -18,7 +18,6 @@ package org.apache.activemq.artemis.logs;
import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
@@ -44,7 +43,7 @@ public interface ActiveMQUtilBundle {
IllegalStateException stringTooLong(Integer length);
@Message(id = 209003, value = "Error instantiating codec {}")
- IllegalArgumentException errorCreatingCodec(String codecClassName, @Cause Exception e);
+ IllegalArgumentException errorCreatingCodec(String codecClassName, Exception e);
@Message(id = 209004, value = "Failed to parse long value from {}")
IllegalArgumentException failedToParseLong(String value);
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 d31c4f70b7..9bd7120145 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
@@ -17,7 +17,6 @@
package org.apache.activemq.artemis.logs;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
@@ -48,37 +47,37 @@ public interface ActiveMQUtilLogger {
void urlWasntReacheable(String url);
@LogMessage(id = 202004, value = "Error starting component {} ", level = LogMessage.Level.WARN)
- void errorStartingComponent(String component, @Cause Exception e);
+ void errorStartingComponent(String component, Exception e);
@LogMessage(id = 202005, value = "Error stopping component {} ", level = LogMessage.Level.WARN)
- void errorStoppingComponent(String component, @Cause Exception e);
+ void errorStoppingComponent(String component, Exception e);
@LogMessage(id = 202006, value = "Failed to check Url {}.", level = LogMessage.Level.WARN)
- void failedToCheckURL(String url, @Cause Exception e);
+ void failedToCheckURL(String url, Exception e);
@LogMessage(id = 202007, value = "Failed to check Address {}.", level = LogMessage.Level.WARN)
- void failedToCheckAddress(String address, @Cause Exception e);
+ void failedToCheckAddress(String address, Exception e);
@LogMessage(id = 202008, value = "Failed to check Address list {}.", level = LogMessage.Level.WARN)
- void failedToParseAddressList(String addressList, @Cause Exception e);
+ void failedToParseAddressList(String addressList, Exception e);
@LogMessage(id = 202009, value = "Failed to check Url list {}.", level = LogMessage.Level.WARN)
- void failedToParseUrlList(String urlList, @Cause Exception e);
+ void failedToParseUrlList(String urlList, Exception e);
@LogMessage(id = 202010, value = "Failed to set NIC {}.", level = LogMessage.Level.WARN)
- void failedToSetNIC(String nic, @Cause Exception e);
+ void failedToSetNIC(String nic, Exception e);
@LogMessage(id = 202011, value = "Failed to read from stream {}.", level = LogMessage.Level.WARN)
void failedToReadFromStream(String stream);
@LogMessage(id = 202012, value = "Object cannot be serialized.", level = LogMessage.Level.WARN)
- void failedToSerializeObject(@Cause Exception e);
+ void failedToSerializeObject(Exception e);
@LogMessage(id = 202013, value = "Unable to deserialize object.", level = LogMessage.Level.WARN)
- void failedToDeserializeObject(@Cause Exception e);
+ void failedToDeserializeObject(Exception e);
@LogMessage(id = 202014, value = "Unable to encode byte array into Base64 notation.", level = LogMessage.Level.WARN)
- void failedToEncodeByteArrayToBase64Notation(@Cause Exception e);
+ void failedToEncodeByteArrayToBase64Notation(Exception e);
@LogMessage(id = 202015, value = "Failed to clean up file {}", level = LogMessage.Level.WARN)
void failedToCleanupFile(String file);
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 9dae59cf7d..705f3af314 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
@@ -18,7 +18,6 @@ package org.apache.activemq.artemis.logs;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.GetLogger;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.slf4j.Logger;
@@ -2000,7 +1999,7 @@ public interface AuditLogger {
}
@LogMessage(id = 601264, value = "User {} gets security check failure", level = LogMessage.Level.INFO)
- void securityFailure(String user, @Cause Throwable cause);
+ void securityFailure(String user, Throwable cause);
static void createCoreConsumer(Object source, Subject user, String remoteAddress, Object... args) {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index 8f27c585a7..0480e9a247 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -21,7 +21,6 @@ import java.net.UnknownHostException;
import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
import org.apache.activemq.artemis.api.core.Interceptor;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.w3c.dom.Node;
@@ -35,13 +34,13 @@ public interface ActiveMQClientLogger {
ActiveMQClientLogger LOGGER = CodeFactory.getCodeClass(ActiveMQClientLogger.class, ActiveMQClientLogger.class.getPackage().getName());
@LogMessage(id = 212001, value = "Error on clearing messages", level = LogMessage.Level.WARN)
- void errorClearingMessages(@Cause Throwable e);
+ void errorClearingMessages(Throwable e);
@LogMessage(id = 212002, value = "Timed out waiting for handler to complete processing", level = LogMessage.Level.WARN)
void timeOutWaitingForProcessing();
@LogMessage(id = 212003, value = "Unable to close session", level = LogMessage.Level.WARN)
- void unableToCloseSession(@Cause Exception e);
+ void unableToCloseSession(Exception e);
@LogMessage(id = 212004, value = "Failed to connect to server.", level = LogMessage.Level.WARN)
void failedToConnectToServer();
@@ -50,10 +49,10 @@ public interface ActiveMQClientLogger {
void failedToConnectToServer(Integer reconnectAttempts);
@LogMessage(id = 212007, value = "connector.create or connectorFactory.createConnector should never throw an exception, implementation is badly behaved, but we will deal with it anyway.", level = LogMessage.Level.WARN)
- void createConnectorException(@Cause Exception e);
+ void createConnectorException(Exception e);
@LogMessage(id = 212008, value = "I am closing a core ClientSessionFactory you left open. Please make sure you close all ClientSessionFactories explicitly " + "before letting them go out of scope! {}", level = LogMessage.Level.WARN)
- void factoryLeftOpen(int i, @Cause Exception e);
+ void factoryLeftOpen(int i, Exception e);
@LogMessage(id = 212009, value = "resetting session after failure", level = LogMessage.Level.WARN)
void resettingSessionAfterFailure();
@@ -71,37 +70,37 @@ public interface ActiveMQClientLogger {
void failoverDuringPrepareRollingBack();
@LogMessage(id = 212015, value = "failover occurred during prepare rolling back", level = LogMessage.Level.WARN)
- void errorDuringPrepare(@Cause Throwable e);
+ void errorDuringPrepare(Throwable e);
@LogMessage(id = 212016, value = "I am closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly before letting them go out of scope! {}", level = LogMessage.Level.WARN)
- void clientSessionNotClosed(int identity, @Cause Exception e);
+ void clientSessionNotClosed(int identity, Exception e);
@LogMessage(id = 212017, value = "error adding packet", level = LogMessage.Level.WARN)
- void errorAddingPacket(@Cause Exception e);
+ void errorAddingPacket(Exception e);
@LogMessage(id = 212018, value = "error calling cancel", level = LogMessage.Level.WARN)
- void errorCallingCancel(@Cause Exception e);
+ void errorCallingCancel(Exception e);
@LogMessage(id = 212019, value = "error reading index", level = LogMessage.Level.WARN)
- void errorReadingIndex(@Cause Exception e);
+ void errorReadingIndex(Exception e);
@LogMessage(id = 212020, value = "error setting index", level = LogMessage.Level.WARN)
- void errorSettingIndex(@Cause Exception e);
+ void errorSettingIndex(Exception e);
@LogMessage(id = 212021, value = "error resetting index", level = LogMessage.Level.WARN)
- void errorReSettingIndex(@Cause Exception e);
+ void errorReSettingIndex(Exception e);
@LogMessage(id = 212022, value = "error reading LargeMessage file cache", level = LogMessage.Level.WARN)
- void errorReadingCache(@Cause Exception e);
+ void errorReadingCache(Exception e);
@LogMessage(id = 212023, value = "error closing LargeMessage file cache", level = LogMessage.Level.WARN)
- void errorClosingCache(@Cause Exception e);
+ void errorClosingCache(Exception e);
@LogMessage(id = 212024, value = "Exception during finalization for LargeMessage file cache", level = LogMessage.Level.WARN)
- void errorFinalisingCache(@Cause Exception e);
+ void errorFinalisingCache(Exception e);
@LogMessage(id = 212025, value = "did not connect the cluster connection to other nodes", level = LogMessage.Level.WARN)
- void errorConnectingToNodes(@Cause Exception e);
+ void errorConnectingToNodes(Exception e);
@LogMessage(id = 212026, value = "Timed out waiting for pool to terminate", level = LogMessage.Level.WARN)
void timedOutWaitingForTermination();
@@ -110,26 +109,26 @@ public interface ActiveMQClientLogger {
void timedOutWaitingForScheduledPoolTermination();
@LogMessage(id = 212028, value = "error starting server locator", level = LogMessage.Level.WARN)
- void errorStartingLocator(@Cause Exception e);
+ void errorStartingLocator(Exception e);
@LogMessage(id = 212030, value = "error sending topology", level = LogMessage.Level.WARN)
- void errorSendingTopology(@Cause Throwable e);
+ void errorSendingTopology(Throwable e);
@LogMessage(id = 212031, value = "error sending topology", level = LogMessage.Level.WARN)
- void errorSendingTopologyNodedown(@Cause Throwable e);
+ void errorSendingTopologyNodedown(Throwable e);
@LogMessage(id = 212032, value = "Timed out waiting to stop discovery thread", level = LogMessage.Level.WARN)
void timedOutStoppingDiscovery();
@LogMessage(id = 212033, value = "unable to send notification when discovery group is stopped", level = LogMessage.Level.WARN)
- void errorSendingNotifOnDiscoveryStop(@Cause Throwable e);
+ void errorSendingNotifOnDiscoveryStop(Throwable e);
@LogMessage(id = 212034, value = "There are more than one servers on the network broadcasting the same node id. " + "You will see this message exactly once (per node) if a node is restarted, in which case it can be safely " + "ignored. But if it is logged continuously it means you really do have more than one node on the same network " + "active concurrently with the same node id. This could occur if you have a backup node active at the same time as " + "its live node. nodeID={}", lev [...]
void multipleServersBroadcastingSameNode(String nodeId);
@LogMessage(id = 212035, value = "error receiving packet in discovery", level = LogMessage.Level.WARN)
- void errorReceivingPacketInDiscovery(@Cause Throwable e);
+ void errorReceivingPacketInDiscovery(Throwable e);
@LogMessage(id = 212036, value = "Can not find packet to clear: {} last received command id first stored command id {}", level = LogMessage.Level.WARN)
void cannotFindPacketToClear(Integer lastReceivedCommandID, Integer firstStoredCommandID);
@@ -138,7 +137,7 @@ public interface ActiveMQClientLogger {
void connectionFailureDetected(String remoteAddress, String message, ActiveMQExceptionType type);
@LogMessage(id = 212038, value = "Failure in calling interceptor: {}", level = LogMessage.Level.WARN)
- void errorCallingInterceptor(Interceptor interceptor, @Cause Throwable e);
+ void errorCallingInterceptor(Interceptor interceptor, Throwable e);
@LogMessage(id = 212040, value = "Timed out waiting for netty ssl close future to complete", level = LogMessage.Level.WARN)
void timeoutClosingSSL();
@@ -165,7 +164,7 @@ public interface ActiveMQClientLogger {
void jvmAllocatedMoreMemory(Long totalMemory1, Long totalMemory2);
@LogMessage(id = 212048, value = "Random address ({}) was already in use, trying another time", level = LogMessage.Level.WARN)
- void broadcastGroupBindErrorRetry(String hostAndPort, @Cause Throwable t);
+ void broadcastGroupBindErrorRetry(String hostAndPort, Throwable t);
@LogMessage(id = 212049, value = "Could not bind to {} ({} address); " + "make sure your discovery group-address is of the same type as the IP stack (IPv4 or IPv6)." + "\nIgnoring discovery group-address, but this may lead to cross talking.", level = LogMessage.Level.WARN)
void ioDiscoveryError(String hostAddress, String s);
@@ -174,10 +173,10 @@ public interface ActiveMQClientLogger {
void compressedLargeMessageError(int length, int nReadBytes);
@LogMessage(id = 212051, value = "Invalid concurrent session usage. Sessions are not supposed to be used by more than one thread concurrently.", level = LogMessage.Level.WARN)
- void invalidConcurrentSessionUsage(@Cause Throwable t);
+ void invalidConcurrentSessionUsage(Throwable t);
@LogMessage(id = 212052, value = "Packet {} was answered out of sequence due to a previous server timeout and it's being ignored", level = LogMessage.Level.WARN)
- void packetOutOfOrder(Object obj, @Cause Throwable t);
+ void packetOutOfOrder(Object obj, Throwable t);
/**
* Warns about usage of {@link org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler} or JMS's {@code CompletionWindow} with
@@ -191,7 +190,7 @@ public interface ActiveMQClientLogger {
void outOfCreditOnFlowControl(String address);
@LogMessage(id = 212055, value = "Unable to close consumer", level = LogMessage.Level.WARN)
- void unableToCloseConsumer(@Cause Exception e);
+ void unableToCloseConsumer(Exception e);
@LogMessage(id = 212056, value = "local-bind-address specified for broadcast group but no local-bind-port. Using random port for UDP Broadcast ({})", level = LogMessage.Level.WARN)
void broadcastGroupBindError(String hostAndPort);
@@ -200,7 +199,7 @@ public interface ActiveMQClientLogger {
void timeoutStreamingLargeMessage();
@LogMessage(id = 212058, value = "Unable to get a message.", level = LogMessage.Level.WARN)
- void unableToGetMessage(@Cause Exception e);
+ void unableToGetMessage(Exception e);
@LogMessage(id = 212059, value = "Failed to clean up: {} ", level = LogMessage.Level.WARN)
void failedCleaningUp(String target);
@@ -209,25 +208,25 @@ public interface ActiveMQClientLogger {
void unexpectedNullDataReceived();
@LogMessage(id = 212061, value = "Failed to perform force close ", level = LogMessage.Level.WARN)
- void failedForceClose(@Cause Throwable e);
+ void failedForceClose(Throwable e);
@LogMessage(id = 212062, value = "Failed to perform post actions on message processing ", level = LogMessage.Level.WARN)
- void failedPerformPostActionsOnMessage(@Cause Exception e);
+ void failedPerformPostActionsOnMessage(Exception e);
@LogMessage(id = 212063, value = "Unable to handle connection failure ", level = LogMessage.Level.WARN)
- void unableToHandleConnectionFailure(@Cause Throwable e);
+ void unableToHandleConnectionFailure(Throwable e);
@LogMessage(id = 212064, value = "Unable to receive cluster topology ", level = LogMessage.Level.WARN)
- void unableToReceiveClusterTopology(@Cause Throwable e);
+ void unableToReceiveClusterTopology(Throwable e);
@LogMessage(id = 212065, value = "{} getting exception when receiving broadcasting ", level = LogMessage.Level.WARN)
- void unableToReceiveBroadcast(String target, @Cause Exception e);
+ void unableToReceiveBroadcast(String target, Exception e);
@LogMessage(id = 212066, value = "failed to parse int property ", level = LogMessage.Level.WARN)
- void unableToParseValue(@Cause Throwable e);
+ void unableToParseValue(Throwable e);
@LogMessage(id = 212067, value = "failed to get system property ", level = LogMessage.Level.WARN)
- void unableToGetProperty(@Cause Throwable e);
+ void unableToGetProperty(Throwable e);
@LogMessage(id = 212068, value = "Couldn't finish the client globalThreadPool in less than 10 seconds, interrupting it now ", level = LogMessage.Level.WARN)
void unableToProcessGlobalThreadPoolIn10Sec();
@@ -236,16 +235,16 @@ public interface ActiveMQClientLogger {
void unableToProcessScheduledlIn10Sec();
@LogMessage(id = 212070, value = "Unable to initialize VersionLoader ", level = LogMessage.Level.WARN)
- void unableToInitVersionLoader(@Cause Throwable e);
+ void unableToInitVersionLoader(Throwable e);
@LogMessage(id = 212071, value = "Unable to check Epoll availability ", level = LogMessage.Level.WARN)
- void unableToCheckEpollAvailability(@Cause Throwable e);
+ void unableToCheckEpollAvailability(Throwable e);
@LogMessage(id = 212072, value = "Failed to change channel state to ReadyForWriting ", level = LogMessage.Level.WARN)
- void failedToSetChannelReadyForWriting(@Cause Throwable e);
+ void failedToSetChannelReadyForWriting(Throwable e);
@LogMessage(id = 212073, value = "Unable to check KQueue availability ", level = LogMessage.Level.WARN)
- void unableToCheckKQueueAvailability(@Cause Throwable e);
+ void unableToCheckKQueueAvailability(Throwable e);
@LogMessage(id = 212075, value = "KQueue is not available, please add to the classpath or configure useKQueue=false to remove this warning", level = LogMessage.Level.WARN)
void unableToCheckKQueueAvailabilityNoClass();
@@ -263,19 +262,19 @@ public interface ActiveMQClientLogger {
void oldStoreProvider(String value);
@LogMessage(id = 214000, value = "Failed to call onMessage", level = LogMessage.Level.ERROR)
- void onMessageError(@Cause Throwable e);
+ void onMessageError(Throwable e);
@LogMessage(id = 214001, value = "failed to cleanup session", level = LogMessage.Level.ERROR)
- void failedToCleanupSession(@Cause Exception e);
+ void failedToCleanupSession(Exception e);
@LogMessage(id = 214002, value = "Failed to execute failure listener", level = LogMessage.Level.ERROR)
- void failedToExecuteListener(@Cause Throwable t);
+ void failedToExecuteListener(Throwable t);
@LogMessage(id = 214003, value = "Failed to handle failover", level = LogMessage.Level.ERROR)
- void failedToHandleFailover(@Cause Throwable t);
+ void failedToHandleFailover(Throwable t);
@LogMessage(id = 214004, value = "XA end operation failed ", level = LogMessage.Level.ERROR)
- void errorCallingEnd(@Cause Throwable t);
+ void errorCallingEnd(Throwable t);
@LogMessage(id = 214005, value = "XA start operation failed {} code:{}", level = LogMessage.Level.ERROR)
void errorCallingStart(String message, Integer code);
@@ -284,43 +283,43 @@ public interface ActiveMQClientLogger {
void sessionNotXA();
@LogMessage(id = 214007, value = "Received exception asynchronously from server", level = LogMessage.Level.ERROR)
- void receivedExceptionAsynchronously(@Cause Exception e);
+ void receivedExceptionAsynchronously(Exception e);
@LogMessage(id = 214008, value = "Failed to handle packet", level = LogMessage.Level.ERROR)
- void failedToHandlePacket(@Cause Exception e);
+ void failedToHandlePacket(Exception e);
@LogMessage(id = 214009, value = "Failed to stop discovery group", level = LogMessage.Level.ERROR)
- void failedToStopDiscovery(@Cause Throwable e);
+ void failedToStopDiscovery(Throwable e);
@LogMessage(id = 214010, value = "Failed to receive datagram", level = LogMessage.Level.ERROR)
- void failedToReceiveDatagramInDiscovery(@Cause Throwable e);
+ void failedToReceiveDatagramInDiscovery(Throwable e);
@LogMessage(id = 214011, value = "Failed to call discovery listener", level = LogMessage.Level.ERROR)
- void failedToCallListenerInDiscovery(@Cause Throwable e);
+ void failedToCallListenerInDiscovery(Throwable e);
@LogMessage(id = 214013, value = "Failed to decode packet", level = LogMessage.Level.ERROR)
- void errorDecodingPacket(@Cause Throwable e);
+ void errorDecodingPacket(Throwable e);
@LogMessage(id = 214014, value = "Failed to execute failure listener", level = LogMessage.Level.ERROR)
- void errorCallingFailureListener(@Cause Throwable e);
+ void errorCallingFailureListener(Throwable e);
@LogMessage(id = 214015, value = "Failed to execute connection life cycle listener", level = LogMessage.Level.ERROR)
- void errorCallingLifeCycleListener(@Cause Throwable e);
+ void errorCallingLifeCycleListener(Throwable e);
@LogMessage(id = 214016, value = "Failed to create netty connection", level = LogMessage.Level.ERROR)
- void errorCreatingNettyConnection(@Cause Throwable e);
+ void errorCreatingNettyConnection(Throwable e);
@LogMessage(id = 214017, value = "Caught unexpected Throwable", level = LogMessage.Level.ERROR)
- void caughtunexpectedThrowable(@Cause Throwable t);
+ void caughtunexpectedThrowable(Throwable t);
@LogMessage(id = 214018, value = "Failed to invoke getTextContent() on node {}", level = LogMessage.Level.ERROR)
- void errorOnXMLTransform(Node n, @Cause Throwable t);
+ void errorOnXMLTransform(Node n, Throwable t);
@LogMessage(id = 214019, value = "Invalid configuration", level = LogMessage.Level.ERROR)
- void errorOnXMLTransformInvalidConf(@Cause Throwable t);
+ void errorOnXMLTransformInvalidConf(Throwable t);
@LogMessage(id = 214020, value = "Exception happened while stopping Discovery BroadcastEndpoint {}", level = LogMessage.Level.ERROR)
- void errorStoppingDiscoveryBroadcastEndpoint(Object endpoint, @Cause Throwable t);
+ void errorStoppingDiscoveryBroadcastEndpoint(Object endpoint, Throwable t);
@LogMessage(id = 214021, value = "Invalid cipher suite specified. Supported cipher suites are: {}", level = LogMessage.Level.ERROR)
void invalidCipherSuite(String validSuites);
@@ -335,14 +334,14 @@ public interface ActiveMQClientLogger {
void unexpectedResponseFromHttpServer(Object response);
@LogMessage(id = 214030, value = "Failed to bind {}={}", level = LogMessage.Level.ERROR)
- void failedToBind(String p1, String p2, @Cause Throwable cause);
+ void failedToBind(String p1, String p2, Throwable cause);
@LogMessage(id = 214031, value = "Failed to decode buffer, disconnect immediately.", level = LogMessage.Level.ERROR)
- void disconnectOnErrorDecoding(@Cause Throwable cause);
+ void disconnectOnErrorDecoding(Throwable cause);
@LogMessage(id = 214032, value = "Unable to initialize VersionLoader ", level = LogMessage.Level.ERROR)
- void unableToInitVersionLoaderError(@Cause Throwable e);
+ void unableToInitVersionLoaderError(Throwable e);
@LogMessage(id = 214033, value = "Cannot resolve host ", level = LogMessage.Level.ERROR)
- void unableToResolveHost(@Cause UnknownHostException e);
+ void unableToResolveHost(UnknownHostException e);
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
index 41970dbe72..92d14e7a4a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
@@ -33,7 +33,6 @@ import org.apache.activemq.artemis.api.core.ActiveMQTransactionRolledBackExcepti
import org.apache.activemq.artemis.api.core.ActiveMQUnBlockedException;
import org.apache.activemq.artemis.core.cluster.DiscoveryGroup;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
import org.apache.activemq.artemis.spi.core.remoting.Connection;
@@ -55,13 +54,13 @@ public interface ActiveMQClientMessageBundle {
ActiveMQInternalErrorException clientSessionClosed();
@Message(id = 219001, value = "Failed to create session")
- ActiveMQInternalErrorException failedToCreateSession(@Cause Throwable t);
+ ActiveMQInternalErrorException failedToCreateSession(Throwable t);
@Message(id = 219003, value = "Queue can not be both durable and temporary")
ActiveMQInternalErrorException queueMisConfigured();
@Message(id = 219004, value = "Failed to initialise session factory")
- ActiveMQInternalErrorException failedToInitialiseSessionFactory(@Cause Exception e);
+ ActiveMQInternalErrorException failedToInitialiseSessionFactory(Exception e);
@Message(id = 219005, value = "Exception in Netty transport")
ActiveMQInternalErrorException nettyError();
@@ -73,7 +72,7 @@ public interface ActiveMQClientMessageBundle {
ActiveMQNotConnectedException cannotConnectToServers();
@Message(id = 219008, value = "Failed to connect to any static connectors")
- ActiveMQNotConnectedException cannotConnectToStaticConnectors(@Cause Exception e);
+ ActiveMQNotConnectedException cannotConnectToStaticConnectors(Exception e);
@Message(id = 219009, value = "Failed to connect to any static connectors")
ActiveMQNotConnectedException cannotConnectToStaticConnectors2();
@@ -97,7 +96,7 @@ public interface ActiveMQClientMessageBundle {
ActiveMQDisconnectedException disconnected();
@Message(id = 219016, value = "Connection failure detected. Unblocking a blocking call that will never get a response")
- ActiveMQUnBlockedException unblockingACall(@Cause Throwable t);
+ ActiveMQUnBlockedException unblockingACall(Throwable t);
@Message(id = 219017, value = "Consumer is closed")
ActiveMQObjectClosedException consumerClosed();
@@ -124,19 +123,19 @@ public interface ActiveMQClientMessageBundle {
ActiveMQIllegalStateException noTCForSessionFactory();
@Message(id = 219025, value = "Error saving the message body")
- ActiveMQLargeMessageException errorSavingBody(@Cause Exception e);
+ ActiveMQLargeMessageException errorSavingBody(Exception e);
@Message(id = 219026, value = "Error reading the LargeMessageBody")
- ActiveMQLargeMessageException errorReadingBody(@Cause Exception e);
+ ActiveMQLargeMessageException errorReadingBody(Exception e);
@Message(id = 219027, value = "Error closing stream from LargeMessageBody")
- ActiveMQLargeMessageException errorClosingLargeMessage(@Cause Exception e);
+ ActiveMQLargeMessageException errorClosingLargeMessage(Exception e);
@Message(id = 219028, value = "Timeout waiting for LargeMessage Body")
ActiveMQLargeMessageException timeoutOnLargeMessage();
@Message(id = 219029, value = "Error writing body of message")
- ActiveMQLargeMessageException errorWritingLargeMessage(@Cause Exception e);
+ ActiveMQLargeMessageException errorWritingLargeMessage(Exception e);
@Message(id = 219030, value = "The transaction was rolled back on failover to a backup server")
ActiveMQTransactionRolledBackException txRolledBack();
@@ -211,7 +210,7 @@ public interface ActiveMQClientMessageBundle {
IllegalArgumentException mustBeLong(Node element, String value);
@Message(id = 219057, value = "Error decoding password")
- IllegalArgumentException errordecodingPassword(@Cause Exception e);
+ IllegalArgumentException errordecodingPassword(Exception e);
@Message(id = 219058, value = "Address \"{}\" is full. Message encode size = {}B")
ActiveMQAddressFullException addressIsFull(String addressName, int size);
@@ -235,7 +234,7 @@ public interface ActiveMQClientMessageBundle {
IllegalStateException invalidPacket(byte type);
@Message(id = 219065, value = "Failed to handle packet.")
- RuntimeException failedToHandlePacket(@Cause Exception e);
+ RuntimeException failedToHandlePacket(Exception e);
@Message(id = 219066, value = "The connection was redirected")
ActiveMQRoutingException redirected();
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java
index 9f9a642ba8..efeb11258a 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java
@@ -29,7 +29,6 @@ import org.apache.activemq.artemis.api.core.ActiveMQInvalidFilterExpressionExcep
import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
@@ -46,7 +45,7 @@ public interface ActiveMQJMSClientBundle {
ActiveMQJMSClientBundle BUNDLE = CodeFactory.getCodeClass(ActiveMQJMSClientBundle.class);
@Message(id = 139000, value = "Invalid filter: {}")
- ActiveMQInvalidFilterExpressionException invalidFilter(SimpleString filter, @Cause Throwable e);
+ ActiveMQInvalidFilterExpressionException invalidFilter(SimpleString filter, Throwable e);
@Message(id = 139001, value = "Invalid Subscription Name. It is required to set the subscription name")
ActiveMQIllegalStateException invalidSubscriptionName();
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java
index f2f81030ba..e48bdc6f54 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java
@@ -17,7 +17,6 @@
package org.apache.activemq.artemis.jms.client;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
@@ -41,27 +40,27 @@ public interface ActiveMQJMSClientLogger {
ActiveMQJMSClientLogger LOGGER = CodeFactory.getCodeClass(ActiveMQJMSClientLogger.class, ActiveMQJMSClientLogger.class.getPackage().getName());
@LogMessage(id = 132000, value = "I'm closing a JMS connection you left open. Please make sure you close all JMS connections explicitly before letting them go out of scope! see stacktrace to find out where it was created", level = LogMessage.Level.WARN)
- void connectionLeftOpen(@Cause Exception e);
+ void connectionLeftOpen(Exception e);
@LogMessage(id = 132001, value = "Unhandled exception thrown from onMessage", level = LogMessage.Level.WARN)
- void onMessageError(@Cause Exception e);
+ void onMessageError(Exception e);
@LogMessage(id = 134000, value = "Failed to call JMS exception listener", level = LogMessage.Level.ERROR)
- void errorCallingExcListener(@Cause Exception e);
+ void errorCallingExcListener(Exception e);
@LogMessage(id = 134002, value = "Queue Browser failed to create message {}", level = LogMessage.Level.ERROR)
- void errorCreatingMessage(String messageToString, @Cause Throwable e);
+ void errorCreatingMessage(String messageToString, Throwable e);
@LogMessage(id = 134003, value = "Message Listener failed to prepare message for receipt, message={}", level = LogMessage.Level.ERROR)
- void errorPreparingMessageForReceipt(String messagetoString, @Cause Throwable e);
+ void errorPreparingMessageForReceipt(String messagetoString, Throwable e);
@LogMessage(id = 134004, value = "Message Listener failed to process message", level = LogMessage.Level.ERROR)
- void errorProcessingMessage(@Cause Throwable e);
+ void errorProcessingMessage(Throwable e);
@LogMessage(id = 134005, value = "Message Listener failed to recover session", level = LogMessage.Level.ERROR)
- void errorRecoveringSession(@Cause Throwable e);
+ void errorRecoveringSession(Throwable e);
@LogMessage(id = 134006, value = "Failed to call Failover listener", level = LogMessage.Level.ERROR)
- void errorCallingFailoverListener(@Cause Exception e);
+ void errorCallingFailoverListener(Exception e);
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
index 8c75b5d4f9..d303f97ea4 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
@@ -19,7 +19,6 @@ package org.apache.activemq.artemis.jms.bridge;
import javax.management.ObjectName;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
@@ -59,19 +58,19 @@ public interface ActiveMQJMSBridgeLogger {
void bridgeNotStarted(String bridgeName);
@LogMessage(id = 342006, value = "JMS Bridge {}, detected failure on bridge connection", level = LogMessage.Level.WARN)
- void bridgeFailure(String bridgeName, @Cause Exception e);
+ void bridgeFailure(String bridgeName, Exception e);
@LogMessage(id = 342009, value = "JMS Bridge {} failed to send + acknowledge batch, closing JMS objects", level = LogMessage.Level.WARN)
- void bridgeAckError(String bridgeName, @Cause Exception e);
+ void bridgeAckError(String bridgeName, Exception e);
@LogMessage(id = 342010, value = "Failed to connect JMS Bridge {}", level = LogMessage.Level.WARN)
- void bridgeConnectError(String bridgeName, @Cause Exception e);
+ void bridgeConnectError(String bridgeName, Exception e);
@LogMessage(id = 342011, value = "Transaction rolled back, retrying TX", level = LogMessage.Level.WARN)
- void transactionRolledBack(@Cause Exception e);
+ void transactionRolledBack(Exception e);
@LogMessage(id = 344001, value = "JMS Bridge {}, failed to start source connection", level = LogMessage.Level.ERROR)
- void jmsBridgeSrcConnectError(String bridgeName, @Cause Exception e);
+ void jmsBridgeSrcConnectError(String bridgeName, Exception e);
@LogMessage(id = 344002, value = "Failed to start JMS Bridge {}. QoS Mode: {} requires a Transaction Manager, none found", level = LogMessage.Level.ERROR)
void jmsBridgeTransactionManagerMissing(String bridgeName, QualityOfServiceMode qosMode);
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
index 2caf27c0cc..c19791d302 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
@@ -20,7 +20,6 @@ import org.apache.activemq.artemis.api.core.ActiveMQAddressExistsException;
import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
@@ -48,5 +47,5 @@ public interface ActiveMQJMSServerBundle {
ActiveMQAddressExistsException cfBindingsExists(String name);
@Message(id = 129007, value = "Error decoding password using codec instance")
- ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e);
+ ActiveMQIllegalStateException errorDecodingPassword(Exception e);
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
index 3ceb87dee5..90f6e7967f 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
@@ -18,7 +18,6 @@ package org.apache.activemq.artemis.jms.server;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.w3c.dom.Node;
@@ -49,24 +48,24 @@ public interface ActiveMQJMSServerLogger {
void recoveryConnectFailed(String s);
@LogMessage(id = 122011, value = "error unbinding {} from Registry", level = LogMessage.Level.WARN)
- void bindingsUnbindError(String key, @Cause Exception e);
+ void bindingsUnbindError(String key, Exception e);
@LogMessage(id = 122012, value = "JMS Server Manager error", level = LogMessage.Level.WARN)
- void jmsServerError(@Cause Exception e);
+ void jmsServerError(Exception e);
@LogMessage(id = 122013, value = "Error in XA Recovery recover", level = LogMessage.Level.WARN)
- void xaRecoverError(@Cause Exception e);
+ void xaRecoverError(Exception e);
@LogMessage(id = 122014, value = "Notified of connection failure in xa recovery connectionFactory for provider {} will attempt reconnect on next pass",
level = LogMessage.Level.WARN)
- void xaRecoverConnectionError(ClientSessionFactory csf, @Cause Exception e);
+ void xaRecoverConnectionError(ClientSessionFactory csf, Exception e);
@LogMessage(id = 122016, value = "Error in XA Recovery", level = LogMessage.Level.DEBUG)
- void xaRecoveryError(@Cause Exception e);
+ void xaRecoveryError(Exception e);
@LogMessage(id = 122017, value = "Tried to correct invalid \"host\" value \"0.0.0.0\" for \"{}\" connector, but received an exception.",
level = LogMessage.Level.WARN)
- void failedToCorrectHost(String name, @Cause Exception e);
+ void failedToCorrectHost(String name, Exception e);
@LogMessage(id = 122018,
value = "Failed to send notification: {}",
@@ -76,7 +75,7 @@ public interface ActiveMQJMSServerLogger {
@LogMessage(id = 122019,
value = "Unable to deactivate server",
level = LogMessage.Level.WARN)
- void failedToDeactivateServer(@Cause Exception e);
+ void failedToDeactivateServer(Exception e);
@LogMessage(id = 123000, value = "JMS Server Manager Running cached command for {}." + "(In the event of failover after failback has occurred, this message may be output multiple times.)",
level = LogMessage.Level.DEBUG)
@@ -86,5 +85,5 @@ public interface ActiveMQJMSServerLogger {
void jmsConfigMissingKey(Node e);
@LogMessage(id = 124002, value = "Failed to start JMS deployer", level = LogMessage.Level.ERROR)
- void jmsDeployerStartError(@Cause Exception e);
+ void jmsDeployerStartError(Exception e);
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
index 0d5879d414..db6ce55967 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
@@ -18,7 +18,6 @@ package org.apache.activemq.artemis.journal;
import org.apache.activemq.artemis.core.journal.impl.JournalFile;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
@@ -130,43 +129,43 @@ public interface ActiveMQJournalLogger {
void errorOnIOCallback(String errorMessage);
@LogMessage(id = 142022, value = "Timed out on AIO poller shutdown", level = LogMessage.Level.WARN)
- void timeoutOnPollerShutdown(@Cause Exception e);
+ void timeoutOnPollerShutdown(Exception e);
@LogMessage(id = 142023, value = "Executor on file {} couldn't complete its tasks in 60 seconds.", level = LogMessage.Level.WARN)
- void couldNotCompleteTask(String name, @Cause Exception e);
+ void couldNotCompleteTask(String name, Exception e);
@LogMessage(id = 142024, value = "Error completing callback", level = LogMessage.Level.WARN)
- void errorCompletingCallback(@Cause Throwable e);
+ void errorCompletingCallback(Throwable e);
@LogMessage(id = 142025, value = "Error calling onError callback", level = LogMessage.Level.WARN)
- void errorCallingErrorCallback(@Cause Throwable e);
+ void errorCallingErrorCallback(Throwable e);
@LogMessage(id = 142026, value = "Timed out on AIO writer shutdown", level = LogMessage.Level.WARN)
- void timeoutOnWriterShutdown(@Cause Throwable e);
+ void timeoutOnWriterShutdown(Throwable e);
@LogMessage(id = 142027, value = "Error on writing data! {} code - {}", level = LogMessage.Level.WARN)
- void errorWritingData(String errorMessage, int errorCode, @Cause Throwable e);
+ void errorWritingData(String errorMessage, int errorCode, Throwable e);
@LogMessage(id = 142028, value = "Error replaying pending commands after compacting", level = LogMessage.Level.WARN)
- void errorReplayingCommands(@Cause Throwable e);
+ void errorReplayingCommands(Throwable e);
@LogMessage(id = 142029, value = "Error closing file", level = LogMessage.Level.WARN)
- void errorClosingFile(@Cause Throwable e);
+ void errorClosingFile(Throwable e);
@LogMessage(id = 142030, value = "Could not open a file in 60 Seconds", level = LogMessage.Level.WARN)
- void errorOpeningFile(@Cause Throwable e);
+ void errorOpeningFile(Throwable e);
@LogMessage(id = 142031, value = "Error retrieving ID part of the file name {}", level = LogMessage.Level.WARN)
- void errorRetrievingID(String fileName, @Cause Throwable e);
+ void errorRetrievingID(String fileName, Throwable e);
@LogMessage(id = 142032, value = "Error reading journal file", level = LogMessage.Level.WARN)
- void errorReadingFile(@Cause Throwable e);
+ void errorReadingFile(Throwable e);
@LogMessage(id = 142033, value = "Error reinitializing file {}", level = LogMessage.Level.WARN)
- void errorReinitializingFile(JournalFile file, @Cause Throwable e);
+ void errorReinitializingFile(JournalFile file, Throwable e);
@LogMessage(id = 142034, value = "Exception on submitting write", level = LogMessage.Level.WARN)
- void errorSubmittingWrite(@Cause Throwable e);
+ void errorSubmittingWrite(Throwable e);
@LogMessage(id = 142035, value = "Could not stop journal append executor after 60 seconds", level = LogMessage.Level.WARN)
void couldNotStopJournalAppendExecutor();
@@ -175,19 +174,19 @@ public interface ActiveMQJournalLogger {
void errorDeletingFile(Object e);
@LogMessage(id = 144001, value = "Error starting poller", level = LogMessage.Level.ERROR)
- void errorStartingPoller(@Cause Exception e);
+ void errorStartingPoller(Exception e);
@LogMessage(id = 144002, value = "Error pushing opened file", level = LogMessage.Level.ERROR)
- void errorPushingFile(@Cause Exception e);
+ void errorPushingFile(Exception e);
@LogMessage(id = 144003, value = "Error compacting", level = LogMessage.Level.ERROR)
- void errorCompacting(@Cause Throwable e);
+ void errorCompacting(Throwable e);
@LogMessage(id = 144004, value = "Error scheduling compacting", level = LogMessage.Level.ERROR)
- void errorSchedulingCompacting(@Cause Throwable e);
+ void errorSchedulingCompacting(Throwable e);
@LogMessage(id = 144005, value = "Failed to performance blast", level = LogMessage.Level.ERROR)
- void failedToPerfBlast(@Cause Throwable e);
+ void failedToPerfBlast(Throwable e);
@LogMessage(id = 144006, value = "IOError code {}, {}", level = LogMessage.Level.ERROR)
void ioError(int errorCode, String errorMessage);
@@ -202,6 +201,6 @@ public interface ActiveMQJournalLogger {
void cantOpenFileTimeout(long timeout);
@LogMessage(id = 144010, value = "Critical IO Exception happened: {}", level = LogMessage.Level.WARN)
- void criticalIO(String message, @Cause Exception error);
+ void criticalIO(String message, Exception error);
}
diff --git a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/annotation/Cause.java b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/annotation/Cause.java
deleted file mode 100644
index a0751d402e..0000000000
--- a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/annotation/Cause.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.logprocessor.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.PARAMETER;
-
-@Target(PARAMETER)
-@Retention(RetentionPolicy.SOURCE)
-public @interface Cause {
-
-}
diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTLogger.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTLogger.java
index 03a6a0014b..655dc2b1ed 100644
--- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTLogger.java
+++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTLogger.java
@@ -19,7 +19,6 @@ package org.apache.activemq.artemis.core.protocol.mqtt;
import org.apache.activemq.artemis.core.server.MessageReference;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
/**
@@ -43,29 +42,29 @@ public interface MQTTLogger {
MQTTLogger LOGGER = CodeFactory.getCodeClass(MQTTLogger.class, MQTTLogger.class.getPackage().getName());
@LogMessage(id = 832000, value = "Unable to send message: {}", level = LogMessage.Level.WARN)
- void unableToSendMessage(MessageReference message, @Cause Exception e);
+ void unableToSendMessage(MessageReference message, Exception e);
@LogMessage(id = 832001, value = "MQTT client({}) attempted to ack already ack'd message: ", level = LogMessage.Level.WARN)
- void failedToAckMessage(String clientId, @Cause Exception e);
+ void failedToAckMessage(String clientId, Exception e);
@LogMessage(id = 834000, value = "Error removing subscription.", level = LogMessage.Level.ERROR)
- void errorRemovingSubscription(@Cause Exception e);
+ void errorRemovingSubscription(Exception e);
@LogMessage(id = 834001, value = "Error disconnecting client.", level = LogMessage.Level.ERROR)
- void errorDisconnectingClient(@Cause Exception e);
+ void errorDisconnectingClient(Exception e);
@LogMessage(id = 834002, value = "Error processing control packet: {}", level = LogMessage.Level.ERROR)
- void errorProcessingControlPacket(String packet, @Cause Exception e);
+ void errorProcessingControlPacket(String packet, Exception e);
@LogMessage(id = 834003, value = "Error sending will message.", level = LogMessage.Level.ERROR)
- void errorSendingWillMessage(@Cause Exception e);
+ void errorSendingWillMessage(Exception e);
@LogMessage(id = 834004, value = "Error disconnecting consumer.", level = LogMessage.Level.ERROR)
- void errorDisconnectingConsumer(@Cause Exception e);
+ void errorDisconnectingConsumer(Exception e);
@LogMessage(id = 834005, value = "Failed to cast property {}.", level = LogMessage.Level.ERROR)
void failedToCastProperty(String property);
@LogMessage(id = 834006, value = "Failed to publish MQTT message: {}.", level = LogMessage.Level.ERROR)
- void failedToPublishMqttMessage(String exceptionMessage, @Cause Throwable t);
+ void failedToPublishMqttMessage(String exceptionMessage, Throwable t);
}
\ No newline at end of file
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java
index e1638e38fd..cd2ca5f4a6 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java
@@ -17,7 +17,6 @@
package org.apache.activemq.artemis.core.protocol.stomp;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
@@ -48,5 +47,5 @@ public interface ActiveMQStompProtocolLogger {
void sentErrorToClient(String address, String message);
@LogMessage(id = 334023, value = "Unable to send frame {}", level = LogMessage.Level.ERROR)
- void errorSendingFrame(StompFrame frame, @Cause Exception e);
+ void errorSendingFrame(StompFrame frame, Exception e);
}
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
index a5f5bf4977..ebd82bb85a 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
@@ -17,7 +17,6 @@
package org.apache.activemq.artemis.core.protocol.stomp;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
@@ -64,34 +63,34 @@ public interface ActiveMQStompProtocolMessageBundle {
ActiveMQStompException connectionNotEstablished();
@Message(id = 339009, value = "Exception getting session")
- ActiveMQStompException errorGetSession(@Cause Exception e);
+ ActiveMQStompException errorGetSession(Exception e);
@Message(id = 339010, value = "Connection is not valid.")
ActiveMQStompException invalidConnection();
@Message(id = 339011, value = "Error sending message {}")
- ActiveMQStompException errorSendMessage(org.apache.activemq.artemis.api.core.Message message, @Cause Exception e);
+ ActiveMQStompException errorSendMessage(org.apache.activemq.artemis.api.core.Message message, Exception e);
@Message(id = 339012, value = "Error beginning a transaction {}")
- ActiveMQStompException errorBeginTx(String txID, @Cause Exception e);
+ ActiveMQStompException errorBeginTx(String txID, Exception e);
@Message(id = 339013, value = "Error committing {}")
- ActiveMQStompException errorCommitTx(String txID, @Cause Exception e);
+ ActiveMQStompException errorCommitTx(String txID, Exception e);
@Message(id = 339014, value = "Error aborting {}")
- ActiveMQStompException errorAbortTx(String txID, @Cause Exception e);
+ ActiveMQStompException errorAbortTx(String txID, Exception e);
@Message(id = 339015, value = "Client must set destination or id header to a SUBSCRIBE command")
ActiveMQStompException noDestination();
@Message(id = 339016, value = "Error creating subscription {}")
- ActiveMQStompException errorCreatingSubscription(String subscriptionID, @Cause Exception e);
+ ActiveMQStompException errorCreatingSubscription(String subscriptionID, Exception e);
@Message(id = 339017, value = "Error unsubscribing {}")
- ActiveMQStompException errorUnsubscribing(String subscriptionID, @Cause Exception e);
+ ActiveMQStompException errorUnsubscribing(String subscriptionID, Exception e);
@Message(id = 339018, value = "Error acknowledging message {}")
- ActiveMQStompException errorAck(String messageID, @Cause Exception e);
+ ActiveMQStompException errorAck(String messageID, Exception e);
@Message(id = 339019, value = "Invalid char sequence: two consecutive CRs.")
ActiveMQStompException invalidTwoCRs();
@@ -130,7 +129,7 @@ public interface ActiveMQStompProtocolMessageBundle {
ActiveMQStompException needTxIDHeader();
@Message(id = 339031, value = "Error handling send")
- ActiveMQStompException errorHandleSend(@Cause Exception e);
+ ActiveMQStompException errorHandleSend(Exception e);
@Message(id = 339032, value = "Need a transaction id to begin")
ActiveMQStompException beginTxNoID();
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java
index f7b91ba798..3543863ab7 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java
@@ -22,7 +22,6 @@ import javax.resource.NotSupportedException;
import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
@@ -40,7 +39,7 @@ public interface ActiveMQRABundle {
ActiveMQRABundle BUNDLE = CodeFactory.getCodeClass(ActiveMQRABundle.class);
@Message(id = 159000, value = "Error decoding password using codec instance")
- ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e);
+ ActiveMQIllegalStateException errorDecodingPassword(Exception e);
@Message(id = 159001, value = "MDB cannot be deployed as it has no Activation Spec. Please provide an Activation!")
NotSupportedException noActivationSpec();
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
index fe65766839..f69db0e17c 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
@@ -17,7 +17,6 @@
package org.apache.activemq.artemis.ra;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
@@ -63,49 +62,49 @@ public interface ActiveMQRALogger {
void resourceAdaptorStarted();
@LogMessage(id = 152001, value = "problem resetting xa session after failure", level = LogMessage.Level.WARN)
- void problemResettingXASession(@Cause Throwable t);
+ void problemResettingXASession(Throwable t);
@LogMessage(id = 152002, value = "Unable to roll local transaction back", level = LogMessage.Level.WARN)
void unableToRollbackTX();
@LogMessage(id = 152003, value = "unable to reset session after failure, we will place the MDB Inflow now in setup mode for activation={}", level = LogMessage.Level.WARN)
- void unableToResetSession(String spec, @Cause Exception e);
+ void unableToResetSession(String spec, Exception e);
@LogMessage(id = 152004, value = "Handling JMS exception failure", level = LogMessage.Level.WARN)
- void handlingJMSFailure(@Cause Exception e);
+ void handlingJMSFailure(Exception e);
@LogMessage(id = 152005, value = "Failure in broker activation {}", level = LogMessage.Level.WARN)
- void failureInActivation(ActiveMQActivationSpec spec, @Cause Throwable t);
+ void failureInActivation(ActiveMQActivationSpec spec, Throwable t);
@LogMessage(id = 152006, value = "Unable to call after delivery", level = LogMessage.Level.WARN)
- void unableToCallAfterDelivery(@Cause Exception e);
+ void unableToCallAfterDelivery(Exception e);
@LogMessage(id = 152007, value = "Thread {} could not be finished", level = LogMessage.Level.WARN)
void threadCouldNotFinish(String thread);
@LogMessage(id = 152008, value = "Error interrupting handler on endpoint {} handler = {}", level = LogMessage.Level.WARN)
- void errorInterruptingHandler(String endpoint, String handler, @Cause Throwable cause);
+ void errorInterruptingHandler(String endpoint, String handler, Throwable cause);
@LogMessage(id = 152009, value = "Unable to validate properties", level = LogMessage.Level.WARN)
- void unableToValidateProperties(@Cause Exception e);
+ void unableToValidateProperties(Exception e);
@LogMessage(id = 152010, value = "Unable to clear the transaction", level = LogMessage.Level.WARN)
- void unableToClearTheTransaction(@Cause Exception e);
+ void unableToClearTheTransaction(Exception e);
@LogMessage(id = 152011, value = "Unable to close the factory", level = LogMessage.Level.WARN)
- void unableToCloseFactory(@Cause Throwable e);
+ void unableToCloseFactory(Throwable e);
@LogMessage(id = 154000, value = "Error while creating object Reference.", level = LogMessage.Level.ERROR)
- void errorCreatingReference(@Cause Exception e);
+ void errorCreatingReference(Exception e);
@LogMessage(id = 154001, value = "Unable to stop resource adapter.", level = LogMessage.Level.ERROR)
- void errorStoppingRA(@Cause Exception e);
+ void errorStoppingRA(Exception e);
@LogMessage(id = 154003, value = "Unable to reconnect {}", level = LogMessage.Level.ERROR)
- void errorReconnecting(ActiveMQActivationSpec spec, @Cause Throwable t);
+ void errorReconnecting(ActiveMQActivationSpec spec, Throwable t);
@LogMessage(id = 154004, value = "Failed to deliver message", level = LogMessage.Level.ERROR)
- void errorDeliveringMessage(@Cause Throwable t);
+ void errorDeliveringMessage(Throwable t);
@LogMessage(id = 153001, value = "using different ActiveMQRAConnectionFactory", level = LogMessage.Level.DEBUG)
void warnDifferentConnectionfactory();
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
index 77fd74ddf5..1fb688e0b6 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
@@ -19,7 +19,6 @@ package org.apache.activemq.artemis.rest;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
@@ -48,23 +47,23 @@ public interface ActiveMQRestLogger {
void shutdownRestSubscription(String id);
@LogMessage(id = 182002, value = "Failed to push message to {}", level = LogMessage.Level.WARN)
- void failedToPushMessageToUri(String uri, @Cause Exception e);
+ void failedToPushMessageToUri(String uri, Exception e);
@LogMessage(id = 182003, value = "Failed to build Message from object", level = LogMessage.Level.WARN)
- void failedToBuildMessageFromObject(@Cause Exception e);
+ void failedToBuildMessageFromObject(Exception e);
@LogMessage(id = 182004, value = "REST configuration parameter '{}' is deprecated. Use '{}' instead.", level = LogMessage.Level.WARN)
void deprecatedConfiguration(String oldConfigParameter, String newConfigParameter);
@LogMessage(id = 184000, value = "Failed to load push store {}, it is probably corrupted", level = LogMessage.Level.ERROR)
- void errorLoadingStore(String name, @Cause Exception e);
+ void errorLoadingStore(String name, Exception e);
@LogMessage(id = 184001, value = "Error updating store", level = LogMessage.Level.ERROR)
- void errorUpdatingStore(@Cause Exception e);
+ void errorUpdatingStore(Exception e);
@LogMessage(id = 184002, value = "Failed to push message to {} disabling push registration...", level = LogMessage.Level.ERROR)
void errorPushingMessage(XmlLink link);
@LogMessage(id = 184003, value = "Error deleting Subscriber queue", level = LogMessage.Level.ERROR)
- void errorDeletingSubscriberQueue(@Cause ActiveMQException e);
+ void errorDeletingSubscriberQueue(ActiveMQException e);
}
diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
index 52e88484f2..68abac3ccf 100644
--- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
+++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
@@ -17,7 +17,6 @@
package org.apache.activemq.artemis.osgi;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
@@ -42,12 +41,12 @@ public interface ActiveMQOsgiLogger {
void protocolWasRemovedForBroker(String protocol, String name, String message);
@LogMessage(id = 582000, value = "Error starting broker: {}", level = LogMessage.Level.WARN)
- void errorStartingBroker(String name, @Cause Exception e);
+ void errorStartingBroker(String name, Exception e);
@LogMessage(id = 582001, value = "Error stopping broker: {}", level = LogMessage.Level.WARN)
- void errorStoppingBroker(String name, @Cause Exception e);
+ void errorStoppingBroker(String name, Exception e);
@LogMessage(id = 582002, value = "Error getting dataSource provider infos.", level = LogMessage.Level.WARN)
- void errorGettingDataSourceProviderInfo(@Cause Exception e);
+ void errorGettingDataSourceProviderInfo(Exception e);
}
\ No newline at end of file
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
index 47c32cc542..61c85960d8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
@@ -55,7 +55,6 @@ import org.apache.activemq.artemis.core.postoffice.Binding;
import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage;
import org.apache.activemq.artemis.core.security.CheckType;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
@@ -95,7 +94,7 @@ public interface ActiveMQMessageBundle {
ActiveMQInternalErrorException notJournalImpl();
@Message(id = 229007, value = "unhandled error during replication")
- ActiveMQInternalErrorException replicationUnhandledError(@Cause Exception e);
+ ActiveMQInternalErrorException replicationUnhandledError(Exception e);
@Message(id = 229008, value = "Live Node contains more journals than the backup node. Probably a version match error")
ActiveMQInternalErrorException replicationTooManyJournals();
@@ -131,7 +130,7 @@ public interface ActiveMQMessageBundle {
ActiveMQQueueExistsException queueAlreadyExists(SimpleString queueName, SimpleString addressName);
@Message(id = 229020, value = "Invalid filter: {}")
- ActiveMQInvalidFilterExpressionException invalidFilter(SimpleString filter, @Cause Throwable e);
+ ActiveMQInvalidFilterExpressionException invalidFilter(SimpleString filter, Throwable e);
@Message(id = 229021, value = "MessageId was not assigned to Message")
ActiveMQIllegalStateException messageIdNotAssigned();
@@ -287,7 +286,7 @@ public interface ActiveMQMessageBundle {
IllegalArgumentException nullPassword();
@Message(id = 229074, value = "Error instantiating transformer class {}")
- IllegalArgumentException errorCreatingTransformerClass(String transformerClassName, @Cause Exception e);
+ IllegalArgumentException errorCreatingTransformerClass(String transformerClassName, Exception e);
@Message(id = 229075, value = "method autoEncode doesn't know how to convert {} yet")
IllegalArgumentException autoConvertError(Class<? extends Object> aClass);
@@ -488,7 +487,7 @@ public interface ActiveMQMessageBundle {
IllegalArgumentException failedToParseJson(String json);
@Message(id = 229230, value = "Failed to bind acceptor {} to {}")
- IllegalStateException failedToBind(String acceptor, String hostPort, @Cause Exception e);
+ IllegalStateException failedToBind(String acceptor, String hostPort, Exception e);
@Message(id = 229231, value = "Divert Does Not Exist: {}")
ActiveMQDivertDoesNotExistException divertDoesNotExist(String divert);
@@ -527,5 +526,5 @@ public interface ActiveMQMessageBundle {
ActiveMQTimeoutException embeddedWebServerRestartTimeout(long timeout);
@Message(id = 229243, value = "Embedded web server restart failed")
- ActiveMQException embeddedWebServerRestartFailed(@Cause Exception e);
+ ActiveMQException embeddedWebServerRestartFailed(Exception e);
}
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 23f9e2dcc0..061f8e2c0e 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
@@ -49,7 +49,6 @@ import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl;
import org.apache.activemq.artemis.core.server.management.Notification;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.apache.activemq.artemis.spi.core.remoting.Connection;
@@ -148,10 +147,10 @@ public interface ActiveMQServerLogger {
void errorRemovingConnection();
@LogMessage(id = 221022, value = "unable to start connector service: {}", level = LogMessage.Level.INFO)
- void errorStartingConnectorService(String name, @Cause Throwable e);
+ void errorStartingConnectorService(String name, Throwable e);
@LogMessage(id = 221023, value = "unable to stop connector service: {}", level = LogMessage.Level.INFO)
- void errorStoppingConnectorService(String name, @Cause Throwable e);
+ void errorStoppingConnectorService(String name, Throwable e);
@LogMessage(id = 221024, value = "Backup server {} is synchronized with live server, nodeID={}.", level = LogMessage.Level.INFO)
void backupServerSynchronized(ActiveMQServerImpl server, String liveID);
@@ -303,10 +302,10 @@ public interface ActiveMQServerLogger {
void failingOverBasedOnQuorumVoteResults();
@LogMessage(id = 221072, value = "Can't find roles for the subject.", level = LogMessage.Level.INFO)
- void failedToFindRolesForTheSubject(@Cause Exception e);
+ void failedToFindRolesForTheSubject(Exception e);
@LogMessage(id = 221073, value = "Can't add role principal.", level = LogMessage.Level.INFO)
- void failedAddRolePrincipal(@Cause Exception e);
+ void failedAddRolePrincipal(Exception e);
@LogMessage(id = 221074, value = "Debug started : size = {} bytes, messages = {}", level = LogMessage.Level.INFO)
void debugStarted(Long globalSizeBytes, Long numberOfMessages);
@@ -351,7 +350,7 @@ public interface ActiveMQServerLogger {
void serverFinalisedWIthoutBeingSTopped();
@LogMessage(id = 222001, value = "Error closing sessions while stopping server", level = LogMessage.Level.WARN)
- void errorClosingSessionsWhileStoppingServer(@Cause Exception e);
+ void errorClosingSessionsWhileStoppingServer(Exception e);
@LogMessage(id = 222002, value = "Timed out waiting for pool to terminate {}. Interrupting all its threads!", level = LogMessage.Level.WARN)
void timedOutStoppingThreadpool(ExecutorService service);
@@ -369,25 +368,25 @@ public interface ActiveMQServerLogger {
void clusterSecurityRisk();
@LogMessage(id = 222008, value = "unable to restart server, please kill and restart manually", level = LogMessage.Level.WARN)
- void serverRestartWarning(@Cause Exception e);
+ void serverRestartWarning(Exception e);
@LogMessage(id = 222009, value = "Unable to announce backup for replication. Trying to stop the server.", level = LogMessage.Level.WARN)
- void replicationStartProblem(@Cause Exception e);
+ void replicationStartProblem(Exception e);
@LogMessage(id = 222010, value = "Critical IO Error, shutting down the server. file={}, message={}", level = LogMessage.Level.ERROR)
- void ioCriticalIOError(String message, String file, @Cause Throwable code);
+ void ioCriticalIOError(String message, String file, Throwable code);
@LogMessage(id = 222011, value = "Error stopping server", level = LogMessage.Level.WARN)
- void errorStoppingServer(@Cause Exception e);
+ void errorStoppingServer(Exception e);
@LogMessage(id = 222012, value = "Timed out waiting for backup activation to exit", level = LogMessage.Level.WARN)
void backupActivationProblem();
@LogMessage(id = 222013, value = "Error when trying to start replication", level = LogMessage.Level.WARN)
- void errorStartingReplication(@Cause Exception e);
+ void errorStartingReplication(Exception e);
@LogMessage(id = 222014, value = "Error when trying to stop replication", level = LogMessage.Level.WARN)
- void errorStoppingReplication(@Cause Exception e);
+ void errorStoppingReplication(Exception e);
@LogMessage(id = 222016, value = "Cannot deploy a connector with no name specified.", level = LogMessage.Level.WARN)
void connectorWithNoName();
@@ -402,25 +401,25 @@ public interface ActiveMQServerLogger {
void discoveryGroupAlreadyDeployed(String name);
@LogMessage(id = 222020, value = "error scanning for URL's", level = LogMessage.Level.WARN)
- void errorScanningURLs(@Cause Exception e);
+ void errorScanningURLs(Exception e);
@LogMessage(id = 222021, value = "problem undeploying {}", level = LogMessage.Level.WARN)
- void problemUndeployingNode(Node node, @Cause Exception e);
+ void problemUndeployingNode(Node node, Exception e);
@LogMessage(id = 222022, value = "Timed out waiting for paging cursor to stop {}", level = LogMessage.Level.WARN)
void timedOutStoppingPagingCursor(Executor executor);
@LogMessage(id = 222023, value = "problem cleaning page address {}", level = LogMessage.Level.WARN)
- void problemCleaningPageAddress(SimpleString address, @Cause Exception e);
+ void problemCleaningPageAddress(SimpleString address, Exception e);
@LogMessage(id = 222024, value = "Could not complete operations on IO context {}", level = LogMessage.Level.WARN)
void problemCompletingOperations(OperationContext e);
@LogMessage(id = 222025, value = "Problem cleaning page subscription counter", level = LogMessage.Level.WARN)
- void problemCleaningPagesubscriptionCounter(@Cause Exception e);
+ void problemCleaningPagesubscriptionCounter(Exception e);
@LogMessage(id = 222026, value = "Error on cleaning up cursor pages", level = LogMessage.Level.WARN)
- void problemCleaningCursorPages(@Cause Exception e);
+ void problemCleaningCursorPages(Exception e);
@LogMessage(id = 222027, value = "Timed out flushing executors for paging cursor to stop {}", level = LogMessage.Level.WARN)
void timedOutFlushingExecutorsPagingCursor(PageSubscription pageSubscription);
@@ -435,16 +434,16 @@ public interface ActiveMQServerLogger {
void pageInvalid(String fileName, String name);
@LogMessage(id = 222031, value = "Error while deleting page file", level = LogMessage.Level.WARN)
- void pageDeleteError(@Cause Exception e);
+ void pageDeleteError(Exception e);
@LogMessage(id = 222032, value = "page finalise error", level = LogMessage.Level.WARN)
- void pageFinaliseError(@Cause Exception e);
+ void pageFinaliseError(Exception e);
@LogMessage(id = 222033, value = "Page file {} had incomplete records at position {} at record number {}", level = LogMessage.Level.WARN)
void pageSuspectFile(String fileName, int position, int msgNumber);
@LogMessage(id = 222034, value = "Can not delete page transaction id={}", level = LogMessage.Level.WARN)
- void pageTxDeleteError(long recordID, @Cause Exception e);
+ void pageTxDeleteError(long recordID, Exception e);
@LogMessage(id = 222035, value = "Directory {} did not have an identification file {}", level = LogMessage.Level.WARN)
void pageStoreFactoryNoIdFile(String s, String addressFile);
@@ -453,7 +452,7 @@ public interface ActiveMQServerLogger {
void pageStoreTimeout(SimpleString address);
@LogMessage(id = 222037, value = "IO Error, impossible to start paging", level = LogMessage.Level.WARN)
- void pageStoreStartIOError(@Cause Exception e);
+ void pageStoreStartIOError(Exception e);
@LogMessage(id = 222038, value = "Starting paging on address '{}'; {}", level = LogMessage.Level.INFO)
void pageStoreStart(SimpleString storeName, String sizeInfo);
@@ -474,7 +473,7 @@ public interface ActiveMQServerLogger {
void journalCannotFindQueueForMessage(Long queueID);
@LogMessage(id = 222044, value = "It was not possible to delete message {}", level = LogMessage.Level.WARN)
- void journalErrorDeletingMessage(Long messageID, @Cause Exception e);
+ void journalErrorDeletingMessage(Long messageID, Exception e);
@LogMessage(id = 222045, value = "Message in prepared tx for queue {} which does not exist. This message will be ignored.", level = LogMessage.Level.WARN)
void journalMessageInPreparedTX(Long queueID);
@@ -495,19 +494,19 @@ public interface ActiveMQServerLogger {
void journalInvalidRecordTypeOnPreparedTX(Byte recordType);
@LogMessage(id = 222051, value = "Journal Error", level = LogMessage.Level.WARN)
- void journalError(@Cause Exception e);
+ void journalError(Exception e);
@LogMessage(id = 222052, value = "error incrementing delay detection", level = LogMessage.Level.WARN)
- void errorIncrementDelayDeletionCount(@Cause Exception e);
+ void errorIncrementDelayDeletionCount(Exception e);
@LogMessage(id = 222053, value = "Error on copying large message {} for DLA or Expiry", level = LogMessage.Level.WARN)
- void lareMessageErrorCopying(LargeServerMessage largeServerMessage, @Cause Exception e);
+ void lareMessageErrorCopying(LargeServerMessage largeServerMessage, Exception e);
@LogMessage(id = 222054, value = "Error on executing IOCallback", level = LogMessage.Level.WARN)
- void errorExecutingAIOCallback(@Cause Throwable t);
+ void errorExecutingAIOCallback(Throwable t);
@LogMessage(id = 222055, value = "Error on deleting duplicate cache", level = LogMessage.Level.WARN)
- void errorDeletingDuplicateCache(@Cause Exception e);
+ void errorDeletingDuplicateCache(Exception e);
@LogMessage(id = 222056, value = "Did not route to any bindings for address {} and sendToDLAOnNoRoute is true but there is no DLA configured for the address, the message will be ignored.", level = LogMessage.Level.WARN)
void noDLA(SimpleString address);
@@ -519,7 +518,7 @@ public interface ActiveMQServerLogger {
void duplicateMessageDetected(org.apache.activemq.artemis.api.core.Message message);
@LogMessage(id = 222060, value = "Error while confirming large message completion on rollback for recordID={}", level = LogMessage.Level.WARN)
- void journalErrorConfirmingLargeMessage(Long messageID, @Cause Throwable e);
+ void journalErrorConfirmingLargeMessage(Long messageID, Throwable e);
@LogMessage(id = 222061, value = "Client connection failed, clearing up resources for session {}", level = LogMessage.Level.WARN)
void clientConnectionFailed(String name);
@@ -540,13 +539,13 @@ public interface ActiveMQServerLogger {
void connectionFailureDetected(String message, ActiveMQExceptionType type);
@LogMessage(id = 222069, value = "error cleaning up stomp connection", level = LogMessage.Level.WARN)
- void errorCleaningStompConn(@Cause Exception e);
+ void errorCleaningStompConn(Exception e);
@LogMessage(id = 222070, value = "Stomp Transactional acknowledgement is not supported", level = LogMessage.Level.WARN)
void stompTXAckNorSupported();
@LogMessage(id = 222071, value = "Interrupted while waiting for stomp heartbeat to die", level = LogMessage.Level.WARN)
- void errorOnStompHeartBeat(@Cause InterruptedException e);
+ void errorOnStompHeartBeat(InterruptedException e);
@LogMessage(id = 222072, value = "Timed out flushing channel on InVMConnection", level = LogMessage.Level.WARN)
void timedOutFlushingInvmChannel();
@@ -564,19 +563,19 @@ public interface ActiveMQServerLogger {
void nettyChannelStillBound(Channel channel, SocketAddress remoteAddress);
@LogMessage(id = 222078, value = "Error instantiating remoting interceptor {}", level = LogMessage.Level.WARN)
- void errorCreatingRemotingInterceptor(String interceptorClass, @Cause Exception e);
+ void errorCreatingRemotingInterceptor(String interceptorClass, Exception e);
@LogMessage(id = 222079, value = "The following keys are invalid for configuring the acceptor: {} the acceptor will not be started.", level = LogMessage.Level.WARN)
void invalidAcceptorKeys(String s);
@LogMessage(id = 222080, value = "Error instantiating remoting acceptor {}", level = LogMessage.Level.WARN)
- void errorCreatingAcceptor(String factoryClassName, @Cause Exception e);
+ void errorCreatingAcceptor(String factoryClassName, Exception e);
@LogMessage(id = 222081, value = "Timed out waiting for remoting thread pool to terminate", level = LogMessage.Level.WARN)
void timeoutRemotingThreadPool();
@LogMessage(id = 222082, value = "error on connection failure check", level = LogMessage.Level.WARN)
- void errorOnFailureCheck(@Cause Throwable e);
+ void errorOnFailureCheck(Throwable e);
@LogMessage(id = 222083, value = "The following keys are invalid for configuring the connector service: {} the connector will not be started.", level = LogMessage.Level.WARN)
void connectorKeysInvalid(String s);
@@ -588,16 +587,16 @@ public interface ActiveMQServerLogger {
void invalidPacketForReplication(Packet packet);
@LogMessage(id = 222086, value = "error handling packet {} for replication", level = LogMessage.Level.WARN)
- void errorHandlingReplicationPacket(Packet packet, @Cause Exception e);
+ void errorHandlingReplicationPacket(Packet packet, Exception e);
@LogMessage(id = 222087, value = "Replication Error while closing the page on backup", level = LogMessage.Level.WARN)
- void errorClosingPageOnReplication(@Cause Exception e);
+ void errorClosingPageOnReplication(Exception e);
@LogMessage(id = 222088, value = "Journal comparison mismatch:\n{}", level = LogMessage.Level.WARN)
void journalcomparisonMismatch(String s);
@LogMessage(id = 222089, value = "Replication Error deleting large message ID = {}", level = LogMessage.Level.WARN)
- void errorDeletingLargeMessage(long messageId, @Cause Exception e);
+ void errorDeletingLargeMessage(long messageId, Exception e);
@LogMessage(id = 222090, value = "Replication Large MessageID {} is not available on backup server. Ignoring replication message", level = LogMessage.Level.WARN)
void largeMessageNotAvailable(long messageId);
@@ -606,19 +605,19 @@ public interface ActiveMQServerLogger {
void replicationStopOnBackupShutdown();
@LogMessage(id = 222092, value = "Connection to the backup node failed, removing replication now", level = LogMessage.Level.WARN)
- void replicationStopOnBackupFail(@Cause Exception e);
+ void replicationStopOnBackupFail(Exception e);
@LogMessage(id = 222093, value = "Timed out waiting to stop Bridge", level = LogMessage.Level.WARN)
void timedOutWaitingToStopBridge();
@LogMessage(id = 222094, value = "Bridge unable to send message {}, will try again once bridge reconnects", level = LogMessage.Level.WARN)
- void bridgeUnableToSendMessage(MessageReference ref, @Cause Exception e);
+ void bridgeUnableToSendMessage(MessageReference ref, Exception e);
@LogMessage(id = 222095, value = "Connection failed with failedOver={}", level = LogMessage.Level.WARN)
void bridgeConnectionFailed(Boolean failedOver);
@LogMessage(id = 222096, value = "Error on querying binding on bridge {}. Retrying in 100 milliseconds", level = LogMessage.Level.WARN)
- void errorQueryingBridge(String name, @Cause Throwable t);
+ void errorQueryingBridge(String name, Throwable t);
@LogMessage(id = 222097, value = "Address {} does not have any bindings, retry #({})", level = LogMessage.Level.WARN)
void errorQueryingBridge(String address, Integer retryCount);
@@ -627,7 +626,7 @@ public interface ActiveMQServerLogger {
void errorStartingBridge(String name);
@LogMessage(id = 222099, value = "Bridge {} is unable to connect to destination. It will be disabled.", level = LogMessage.Level.WARN)
- void errorConnectingBridge(Bridge bridge, @Cause Exception e);
+ void errorConnectingBridge(Bridge bridge, Exception e);
@LogMessage(id = 222100, value = "ServerLocator was shutdown, can not retry on opening connection for bridge", level = LogMessage.Level.WARN)
void bridgeLocatorShutdown();
@@ -636,7 +635,7 @@ public interface ActiveMQServerLogger {
void bridgeAbortStart(String name, Integer retryCount, Integer reconnectAttempts);
@LogMessage(id = 222102, value = "Unexpected exception while trying to reconnect", level = LogMessage.Level.WARN)
- void errorReConnecting(@Cause Exception e);
+ void errorReConnecting(Exception e);
@LogMessage(id = 222103, value = "transaction with xid {} timed out", level = LogMessage.Level.WARN)
void timedOutXID(Xid xid);
@@ -651,7 +650,7 @@ public interface ActiveMQServerLogger {
void clientConnectionFailedClearingSession(String name);
@LogMessage(id = 222108, value = "unable to send notification when broadcast group is stopped", level = LogMessage.Level.WARN)
- void broadcastGroupClosed(@Cause Exception e);
+ void broadcastGroupClosed(Exception e);
@LogMessage(id = 222109, value = "Timed out waiting for write lock on consumer {} from {}. Check the Thread dump", level = LogMessage.Level.WARN)
void timeoutLockingConsumer(String consumer, String remoteAddress);
@@ -660,28 +659,28 @@ public interface ActiveMQServerLogger {
void noQueueIdDefined(org.apache.activemq.artemis.api.core.Message message, org.apache.activemq.artemis.api.core.Message messageCopy, SimpleString idsHeaderName);
@LogMessage(id = 222111, value = "exception while invoking {} on {}", level = LogMessage.Level.TRACE)
- void managementOperationError(String op, String resourceName, @Cause Exception e);
+ void managementOperationError(String op, String resourceName, Exception e);
@LogMessage(id = 222112, value = "exception while retrieving attribute {} on {}", level = LogMessage.Level.WARN)
- void managementAttributeError(String att, String resourceName, @Cause Exception e);
+ void managementAttributeError(String att, String resourceName, Exception e);
@LogMessage(id = 222113, value = "On ManagementService stop, there are {} unexpected registered MBeans: {}", level = LogMessage.Level.WARN)
void managementStopError(Integer size, List<String> unexpectedResourceNames);
@LogMessage(id = 222114, value = "Unable to delete group binding info {}", level = LogMessage.Level.WARN)
- void unableToDeleteGroupBindings(SimpleString groupId, @Cause Exception e);
+ void unableToDeleteGroupBindings(SimpleString groupId, Exception e);
@LogMessage(id = 222115, value = "Error closing serverLocator={}", level = LogMessage.Level.WARN)
- void errorClosingServerLocator(ServerLocatorInternal clusterLocator, @Cause Exception e);
+ void errorClosingServerLocator(ServerLocatorInternal clusterLocator, Exception e);
@LogMessage(id = 222116, value = "unable to start broadcast group {}", level = LogMessage.Level.WARN)
- void unableToStartBroadcastGroup(String name, @Cause Exception e);
+ void unableToStartBroadcastGroup(String name, Exception e);
@LogMessage(id = 222117, value = "unable to start cluster connection {}", level = LogMessage.Level.WARN)
- void unableToStartClusterConnection(SimpleString name, @Cause Exception e);
+ void unableToStartClusterConnection(SimpleString name, Exception e);
@LogMessage(id = 222118, value = "unable to start Bridge {}", level = LogMessage.Level.WARN)
- void unableToStartBridge(SimpleString name, @Cause Exception e);
+ void unableToStartBridge(SimpleString name, Exception e);
@LogMessage(id = 222119, value = "No connector with name {}. backup cannot be announced.", level = LogMessage.Level.WARN)
void announceBackupNoConnector(String connectorName);
@@ -738,7 +737,7 @@ public interface ActiveMQServerLogger {
void ioErrorRedistributing(Integer errorCode, String errorMessage);
@LogMessage(id = 222137, value = "Unable to announce backup, retrying", level = LogMessage.Level.WARN)
- void errorAnnouncingBackup(@Cause Throwable e);
+ void errorAnnouncingBackup(Throwable e);
@LogMessage(id = 222138, value = "Local Member is not set at on ClusterConnection {}", level = LogMessage.Level.WARN)
void noLocalMemborOnClusterConnection(ClusterConnectionImpl clusterConnection);
@@ -747,10 +746,10 @@ public interface ActiveMQServerLogger {
void remoteQueueAlreadyBoundOnClusterConnection(Object messageFlowRecord, SimpleString clusterName);
@LogMessage(id = 222141, value = "Node Manager can not open file {}", level = LogMessage.Level.WARN)
- void nodeManagerCantOpenFile(File file, @Cause Exception e);
+ void nodeManagerCantOpenFile(File file, Exception e);
@LogMessage(id = 222142, value = "Error on resetting large message deliver - {}", level = LogMessage.Level.WARN)
- void errorResttingLargeMessage(Object deliverer, @Cause Throwable e);
+ void errorResttingLargeMessage(Object deliverer, Throwable e);
@LogMessage(id = 222143, value = "Timed out waiting for executor to complete", level = LogMessage.Level.WARN)
void errorTransferringConsumer();
@@ -759,7 +758,7 @@ public interface ActiveMQServerLogger {
void errorFlushingExecutorsOnQueue();
@LogMessage(id = 222145, value = "Error expiring reference {} on queue", level = LogMessage.Level.WARN)
- void errorExpiringReferencesOnQueue(MessageReference ref, @Cause Exception e);
+ void errorExpiringReferencesOnQueue(MessageReference ref, Exception e);
@LogMessage(id = 222146, value = "Message has expired. No bindings for Expiry Address {} so dropping it", level = LogMessage.Level.WARN)
void errorExpiringReferencesNoBindings(SimpleString expiryAddress);
@@ -777,16 +776,16 @@ public interface ActiveMQServerLogger {
void messageExceededMaxDeliveryNoDLA(MessageReference ref, SimpleString name);
@LogMessage(id = 222151, value = "removing consumer which did not handle a message, consumer={}, message={}", level = LogMessage.Level.WARN)
- void removingBadConsumer(Consumer consumer, Object reference, @Cause Throwable e);
+ void removingBadConsumer(Consumer consumer, Object reference, Throwable e);
@LogMessage(id = 222152, value = "Unable to decrement reference counting on queue", level = LogMessage.Level.WARN)
- void errorDecrementingRefCount(@Cause Throwable e);
+ void errorDecrementingRefCount(Throwable e);
@LogMessage(id = 222153, value = "Cannot locate record for message id = {} on Journal", level = LogMessage.Level.WARN)
- void cannotFindMessageOnJournal(Long messageID, @Cause Throwable e);
+ void cannotFindMessageOnJournal(Long messageID, Throwable e);
@LogMessage(id = 222154, value = "Error checking DLQ", level = LogMessage.Level.WARN)
- void errorCheckingDLQ(@Cause Throwable e);
+ void errorCheckingDLQ(Throwable e);
@LogMessage(id = 222155, value = "Failed to register as backup. Stopping the server.", level = LogMessage.Level.WARN)
void errorRegisteringBackup();
@@ -795,16 +794,16 @@ public interface ActiveMQServerLogger {
void memoryError(Integer memoryWarningThreshold, String info);
@LogMessage(id = 222157, value = "Error completing callback on replication manager", level = LogMessage.Level.WARN)
- void errorCompletingCallbackOnReplicationManager(@Cause Throwable e);
+ void errorCompletingCallbackOnReplicationManager(Throwable e);
@LogMessage(id = 222158, value = "{} activation thread did not finish.", level = LogMessage.Level.WARN)
void activationDidntFinish(ActiveMQServer server);
@LogMessage(id = 222159, value = "unable to send notification when broadcast group is stopped", level = LogMessage.Level.WARN)
- void broadcastBridgeStoppedError(@Cause Exception e);
+ void broadcastBridgeStoppedError(Exception e);
@LogMessage(id = 222160, value = "unable to send notification when broadcast group is stopped", level = LogMessage.Level.WARN)
- void notificationBridgeStoppedError(@Cause Exception e);
+ void notificationBridgeStoppedError(Exception e);
@LogMessage(id = 222161, value = "Group Handler timed-out waiting for sendCondition", level = LogMessage.Level.WARN)
void groupHandlerSendTimeout();
@@ -859,10 +858,10 @@ public interface ActiveMQServerLogger {
void rolePermissionConfigurationError(String permission);
@LogMessage(id = 222178, value = "Error during recovery of page counters", level = LogMessage.Level.WARN)
- void errorRecoveringPageCounter(@Cause Throwable error);
+ void errorRecoveringPageCounter(Throwable error);
@LogMessage(id = 222181, value = "Unable to scaleDown messages", level = LogMessage.Level.WARN)
- void failedToScaleDown(@Cause Throwable e);
+ void failedToScaleDown(Throwable e);
@LogMessage(id = 222182, value = "Missing cluster-configuration for scale-down-clustername {}", level = LogMessage.Level.WARN)
void missingClusterConfigForScaleDown(String scaleDownCluster);
@@ -880,13 +879,13 @@ public interface ActiveMQServerLogger {
void clusterControlAuthfailure(String causeMessage);
@LogMessage(id = 222187, value = "Failed to activate replicated backup", level = LogMessage.Level.WARN)
- void activateReplicatedBackupFailed(@Cause Throwable e);
+ void activateReplicatedBackupFailed(Throwable e);
@LogMessage(id = 222188, value = "Unable to find target queue for node {}", level = LogMessage.Level.WARN)
void unableToFindTargetQueue(String targetNodeID);
@LogMessage(id = 222189, value = "Failed to activate shared store slave", level = LogMessage.Level.WARN)
- void activateSharedStoreSlaveFailed(@Cause Throwable e);
+ void activateSharedStoreSlaveFailed(Throwable e);
@LogMessage(id = 222191, value = "Could not find any configured role for user {}.", level = LogMessage.Level.WARN)
void cannotFindRoleForUser(String user);
@@ -973,163 +972,163 @@ public interface ActiveMQServerLogger {
void connectorRefNotFound(String connectorRef, String clusterConnection);
@LogMessage(id = 222218, value = "Server disconnecting: {}", level = LogMessage.Level.WARN)
- void disconnectCritical(String reason, @Cause Exception e);
+ void disconnectCritical(String reason, Exception e);
@LogMessage(id = 222219, value = "File {} does not exist", level = LogMessage.Level.WARN)
void fileDoesNotExist(String path);
@LogMessage(id = 222220, value = " Error while cleaning paging on queue {}", level = LogMessage.Level.WARN)
- void errorCleaningPagingOnQueue(String queue, @Cause Exception e);
+ void errorCleaningPagingOnQueue(String queue, Exception e);
@LogMessage(id = 222221, value = "Error while cleaning page, during the commit", level = LogMessage.Level.WARN)
- void errorCleaningPagingDuringCommit(@Cause Exception e);
+ void errorCleaningPagingDuringCommit(Exception e);
@LogMessage(id = 222222, value = "Error while deleting page-complete-record", level = LogMessage.Level.WARN)
- void errorDeletingPageCompleteRecord(@Cause Exception e);
+ void errorDeletingPageCompleteRecord(Exception e);
@LogMessage(id = 222223, value = "Failed to calculate message memory estimate", level = LogMessage.Level.WARN)
- void errorCalculateMessageMemoryEstimate(@Cause Throwable e);
+ void errorCalculateMessageMemoryEstimate(Throwable e);
@LogMessage(id = 222224, value = "Failed to calculate scheduled delivery time", level = LogMessage.Level.WARN)
- void errorCalculateScheduledDeliveryTime(@Cause Throwable e);
+ void errorCalculateScheduledDeliveryTime(Throwable e);
@LogMessage(id = 222225, value = "Sending unexpected exception to the client", level = LogMessage.Level.WARN)
- void sendingUnexpectedExceptionToClient(@Cause Throwable e);
+ void sendingUnexpectedExceptionToClient(Throwable e);
@LogMessage(id = 222226, value = "Connection configuration is null for connectorName {}", level = LogMessage.Level.WARN)
void connectionConfigurationIsNull(String connectorName);
@LogMessage(id = 222227, value = "Failed to process an event", level = LogMessage.Level.WARN)
- void failedToProcessEvent(@Cause NamingException e);
+ void failedToProcessEvent(NamingException e);
@LogMessage(id = 222228, value = "Missing replication token on queue", level = LogMessage.Level.WARN)
void missingReplicationTokenOnQueue();
@LogMessage(id = 222229, value = "Failed to perform rollback", level = LogMessage.Level.WARN)
- void failedToPerformRollback(@Cause IllegalStateException e);
+ void failedToPerformRollback(IllegalStateException e);
@LogMessage(id = 222230, value = "Failed to send notification", level = LogMessage.Level.WARN)
- void failedToSendNotification(@Cause Exception e);
+ void failedToSendNotification(Exception e);
@LogMessage(id = 222231, value = "Failed to flush outstanding data from the connection", level = LogMessage.Level.WARN)
- void failedToFlushOutstandingDataFromTheConnection(@Cause Throwable e);
+ void failedToFlushOutstandingDataFromTheConnection(Throwable e);
@LogMessage(id = 222232, value = "Unable to acquire lock", level = LogMessage.Level.WARN)
- void unableToAcquireLock(@Cause Exception e);
+ void unableToAcquireLock(Exception e);
@LogMessage(id = 222233, value = "Unable to destroy connection with session metadata", level = LogMessage.Level.WARN)
- void unableDestroyConnectionWithSessionMetadata(@Cause Throwable e);
+ void unableDestroyConnectionWithSessionMetadata(Throwable e);
@LogMessage(id = 222234, value = "Unable to invoke a callback", level = LogMessage.Level.WARN)
- void unableToInvokeCallback(@Cause Throwable e);
+ void unableToInvokeCallback(Throwable e);
@LogMessage(id = 222235, value = "Unable to inject a monitor", level = LogMessage.Level.WARN)
- void unableToInjectMonitor(@Cause Throwable e);
+ void unableToInjectMonitor(Throwable e);
@LogMessage(id = 222236, value = "Unable to flush deliveries", level = LogMessage.Level.WARN)
- void unableToFlushDeliveries(@Cause Exception e);
+ void unableToFlushDeliveries(Exception e);
@LogMessage(id = 222237, value = "Unable to stop redistributor", level = LogMessage.Level.WARN)
- void unableToCancelRedistributor(@Cause Exception e);
+ void unableToCancelRedistributor(Exception e);
@LogMessage(id = 222238, value = "Unable to commit transaction", level = LogMessage.Level.WARN)
- void unableToCommitTransaction(@Cause Exception e);
+ void unableToCommitTransaction(Exception e);
@LogMessage(id = 222239, value = "Unable to delete Queue status", level = LogMessage.Level.WARN)
- void unableToDeleteQueueStatus(@Cause Exception e);
+ void unableToDeleteQueueStatus(Exception e);
@LogMessage(id = 222240, value = "Unable to pause a Queue", level = LogMessage.Level.WARN)
- void unableToPauseQueue(@Cause Exception e);
+ void unableToPauseQueue(Exception e);
@LogMessage(id = 222241, value = "Unable to resume a Queue", level = LogMessage.Level.WARN)
- void unableToResumeQueue(@Cause Exception e);
+ void unableToResumeQueue(Exception e);
@LogMessage(id = 222242, value = "Unable to obtain message priority, using default ", level = LogMessage.Level.WARN)
- void unableToGetMessagePriority(@Cause Throwable e);
+ void unableToGetMessagePriority(Throwable e);
@LogMessage(id = 222243, value = "Unable to extract GroupID from message", level = LogMessage.Level.WARN)
- void unableToExtractGroupID(@Cause Throwable e);
+ void unableToExtractGroupID(Throwable e);
@LogMessage(id = 222244, value = "Unable to check if message expired", level = LogMessage.Level.WARN)
- void unableToCheckIfMessageExpired(@Cause Throwable e);
+ void unableToCheckIfMessageExpired(Throwable e);
@LogMessage(id = 222245, value = "Unable to perform post acknowledge", level = LogMessage.Level.WARN)
- void unableToPerformPostAcknowledge(@Cause Throwable e);
+ void unableToPerformPostAcknowledge(Throwable e);
@LogMessage(id = 222246, value = "Unable to rollback on close", level = LogMessage.Level.WARN)
- void unableToRollbackOnClose(@Cause Exception e);
+ void unableToRollbackOnClose(Exception e);
@LogMessage(id = 222247, value = "Unable to close consumer", level = LogMessage.Level.WARN)
- void unableToCloseConsumer(@Cause Throwable e);
+ void unableToCloseConsumer(Throwable e);
@LogMessage(id = 222248, value = "Unable to remove consumer", level = LogMessage.Level.WARN)
- void unableToRemoveConsumer(@Cause Throwable e);
+ void unableToRemoveConsumer(Throwable e);
@LogMessage(id = 222249, value = "Unable to rollback on TX timed out", level = LogMessage.Level.WARN)
- void unableToRollbackOnTxTimedOut(@Cause Exception e);
+ void unableToRollbackOnTxTimedOut(Exception e);
@LogMessage(id = 222250, value = "Unable to delete heuristic completion from storage manager", level = LogMessage.Level.WARN)
- void unableToDeleteHeuristicCompletion(@Cause Exception e);
+ void unableToDeleteHeuristicCompletion(Exception e);
@LogMessage(id = 222251, value = "Unable to start replication", level = LogMessage.Level.WARN)
- void unableToStartReplication(@Cause Exception e);
+ void unableToStartReplication(Exception e);
@LogMessage(id = 222252, value = "Unable to calculate file size", level = LogMessage.Level.WARN)
- void unableToCalculateFileSize(@Cause Exception e);
+ void unableToCalculateFileSize(Exception e);
@LogMessage(id = 222253, value = "Error while syncing data on largeMessageInSync:: {}", level = LogMessage.Level.WARN)
- void errorWhileSyncingData(String target, @Cause Throwable e);
+ void errorWhileSyncingData(String target, Throwable e);
@LogMessage(id = 222254, value = "Invalid record type {}", level = LogMessage.Level.WARN)
- void invalidRecordType(byte type, @Cause Throwable e);
+ void invalidRecordType(byte type, Throwable e);
@LogMessage(id = 222255, value = "Unable to calculate file store usage", level = LogMessage.Level.WARN)
- void unableToCalculateFileStoreUsage(@Cause Exception e);
+ void unableToCalculateFileStoreUsage(Exception e);
@LogMessage(id = 222256, value = "Failed to unregister acceptors", level = LogMessage.Level.WARN)
- void failedToUnregisterAcceptors(@Cause Exception e);
+ void failedToUnregisterAcceptors(Exception e);
@LogMessage(id = 222257, value = "Failed to decrement message reference count", level = LogMessage.Level.WARN)
- void failedToDecrementMessageReferenceCount(@Cause Exception e);
+ void failedToDecrementMessageReferenceCount(Exception e);
@LogMessage(id = 222258, value = "Error on deleting queue {}", level = LogMessage.Level.WARN)
- void errorOnDeletingQueue(String queueName, @Cause Exception e);
+ void errorOnDeletingQueue(String queueName, Exception e);
@LogMessage(id = 222259, value = "Failed to flush the executor", level = LogMessage.Level.WARN)
- void failedToFlushExecutor(@Cause InterruptedException e);
+ void failedToFlushExecutor(InterruptedException e);
@LogMessage(id = 222260, value = "Failed to perform rollback", level = LogMessage.Level.WARN)
- void failedToRollback(@Cause Exception e);
+ void failedToRollback(Exception e);
@LogMessage(id = 222261, value = "Failed to activate a backup", level = LogMessage.Level.WARN)
- void failedToActivateBackup(@Cause Exception e);
+ void failedToActivateBackup(Exception e);
@LogMessage(id = 222262, value = "Failed to stop cluster manager", level = LogMessage.Level.WARN)
- void failedToStopClusterManager(@Cause Exception e);
+ void failedToStopClusterManager(Exception e);
@LogMessage(id = 222263, value = "Failed to stop cluster connection", level = LogMessage.Level.WARN)
- void failedToStopClusterConnection(@Cause Exception e);
+ void failedToStopClusterConnection(Exception e);
@LogMessage(id = 222264, value = "Failed to process message reference after rollback", level = LogMessage.Level.WARN)
- void failedToProcessMessageReferenceAfterRollback(@Cause Exception e);
+ void failedToProcessMessageReferenceAfterRollback(Exception e);
@LogMessage(id = 222265, value = "Failed to finish delivery, unable to lock delivery", level = LogMessage.Level.WARN)
- void failedToFinishDelivery(@Cause Exception e);
+ void failedToFinishDelivery(Exception e);
@LogMessage(id = 222266, value = "Failed to send request to the node", level = LogMessage.Level.WARN)
- void failedToSendRequestToNode(@Cause Exception e);
+ void failedToSendRequestToNode(Exception e);
@LogMessage(id = 222267, value = "Failed to disconnect bindings", level = LogMessage.Level.WARN)
- void failedToDisconnectBindings(@Cause Exception e);
+ void failedToDisconnectBindings(Exception e);
@LogMessage(id = 222268, value = "Failed to remove a record", level = LogMessage.Level.WARN)
- void failedToRemoveRecord(@Cause Exception e);
+ void failedToRemoveRecord(Exception e);
@LogMessage(id = 222269, value = "Please use a fixed value for \"journal-pool-files\". Default changed per https://issues.apache.org/jira/browse/ARTEMIS-1628", level = LogMessage.Level.WARN)
void useFixedValueOnJournalPoolFiles();
@LogMessage(id = 222270, value = "Unable to create management notification address: {}", level = LogMessage.Level.WARN)
- void unableToCreateManagementNotificationAddress(SimpleString addressName, @Cause Exception e);
+ void unableToCreateManagementNotificationAddress(SimpleString addressName, Exception e);
@LogMessage(id = 22272, value = "Message ack in prepared tx for queue {} which does not exist. This ack will be ignored.", level = LogMessage.Level.WARN)
void journalMessageAckMissingQueueInPreparedTX(Long queueID);
@@ -1144,13 +1143,13 @@ public interface ActiveMQServerLogger {
void problemDeployingQueue(String queueName, String message);
@LogMessage(id = 222276, value = "Failed to process changes to the logging configuration file: {}", level = LogMessage.Level.WARN)
- void loggingReloadFailed(String configFile, @Cause Exception e);
+ void loggingReloadFailed(String configFile, Exception e);
@LogMessage(id = 222277, value = "Problem initializing automatic logging configuration reload for {}", level = LogMessage.Level.WARN)
- void problemAddingConfigReloadCallback(String propertyName, @Cause Exception e);
+ void problemAddingConfigReloadCallback(String propertyName, Exception e);
@LogMessage(id = 222278, value = "Unable to extract GroupSequence from message", level = LogMessage.Level.WARN)
- void unableToExtractGroupSequence(@Cause Throwable e);
+ void unableToExtractGroupSequence(Throwable e);
@LogMessage(id = 222279, value = "Federation upstream {} policy ref {} could not be resolved in federation configuration", level = LogMessage.Level.WARN)
void federationCantFindPolicyRef(String upstreamName, String policyRef);
@@ -1174,10 +1173,10 @@ public interface ActiveMQServerLogger {
void emptyAddressFile(String addressFile, String directory);
@LogMessage(id = 222286, value = "Error executing {} federation plugin method.", level = LogMessage.Level.WARN)
- void federationPluginExecutionError(String pluginMethod, @Cause Throwable e);
+ void federationPluginExecutionError(String pluginMethod, Throwable e);
@LogMessage(id = 222287, value = "Error looking up bindings for address {}.", level = LogMessage.Level.WARN)
- void federationBindingsLookupError(SimpleString address, @Cause Throwable e);
+ void federationBindingsLookupError(SimpleString address, Throwable e);
@LogMessage(id = 222288, value = "Page {}, message {} could not be found on offset {}, with starting message {}. This represents a logic error or inconsistency on the data, and the system will try once again from the beggining of the page file.", level = LogMessage.Level.WARN)
void pageLookupError(long pageNr, int messageNr, int offset, int startNr);
@@ -1204,13 +1203,13 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 222296, value = "Unable to deploy Hawtio MBeam, console client side RBAC not available", level = LogMessage.Level.WARN)
- void unableToDeployHawtioMBean(@Cause Exception e);
+ void unableToDeployHawtioMBean(Exception e);
@LogMessage(id = 222297, value = "Unable to start Management Context, RBAC not available", level = LogMessage.Level.WARN)
- void unableStartManagementContext(@Cause Exception e);
+ void unableStartManagementContext(Exception e);
@LogMessage(id = 222298, value = "Failed to create bootstrap user \"{}\". User management may not function.", level = LogMessage.Level.WARN)
- void failedToCreateBootstrapCredentials(String user, @Cause Exception e);
+ void failedToCreateBootstrapCredentials(String user, Exception e);
@LogMessage(id = 222299, value = "No bootstrap credentials found. User management may not function.", level = LogMessage.Level.WARN)
void noBootstrapCredentialsFound();
@@ -1225,16 +1224,16 @@ public interface ActiveMQServerLogger {
void failedToDealWithObjectProperty(SimpleString property, String exceptionMessage);
@LogMessage(id = 222303, value = "Redistribution by {} of messageID = {} failed", level = LogMessage.Level.WARN)
- void errorRedistributing(String queueName, long m, @Cause Throwable t);
+ void errorRedistributing(String queueName, long m, Throwable t);
@LogMessage(id = 222304, value = "Unable to load message from journal", level = LogMessage.Level.WARN)
- void unableToLoadMessageFromJournal(@Cause Throwable t);
+ void unableToLoadMessageFromJournal(Throwable t);
@LogMessage(id = 222305, value = "Error federating message {}.", level = LogMessage.Level.WARN)
- void federationDispatchError(String message, @Cause Throwable e);
+ void federationDispatchError(String message, Throwable e);
@LogMessage(id = 222306, value = "Failed to load prepared TX and it will be rolled back: {}", level = LogMessage.Level.WARN)
- void failedToLoadPreparedTX(String message, @Cause Throwable e);
+ void failedToLoadPreparedTX(String message, Throwable e);
@LogMessage(id = 222307, value = "The queues element is deprecated and replaced by the addresses element", level = LogMessage.Level.WARN)
void queuesElementDeprecated();
@@ -1245,19 +1244,19 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 224000, value = "Failure in initialisation", level = LogMessage.Level.ERROR)
- void initializationError(@Cause Throwable e);
+ void initializationError(Throwable e);
@LogMessage(id = 224001, value = "Error deploying URI {}", level = LogMessage.Level.ERROR)
- void errorDeployingURI(URI uri, @Cause Throwable e);
+ void errorDeployingURI(URI uri, Throwable e);
@LogMessage(id = 224002, value = "Error deploying URI", level = LogMessage.Level.ERROR)
- void errorDeployingURI(@Cause Throwable e);
+ void errorDeployingURI(Throwable e);
@LogMessage(id = 224003, value = "Error undeploying URI {}", level = LogMessage.Level.ERROR)
- void errorUnDeployingURI(URI a, @Cause Throwable e);
+ void errorUnDeployingURI(URI a, Throwable e);
@LogMessage(id = 224005, value = "Unable to deploy node {}", level = LogMessage.Level.ERROR)
- void unableToDeployNode(Node node, @Cause Exception e);
+ void unableToDeployNode(Node node, Exception e);
@LogMessage(id = 224006, value = "Invalid filter: {}", level = LogMessage.Level.ERROR)
void invalidFilter(SimpleString filter);
@@ -1266,7 +1265,7 @@ public interface ActiveMQServerLogger {
void pageSubscriptionError(IOCallback IOCallback, String error);
@LogMessage(id = 224008, value = "Failed to store id", level = LogMessage.Level.ERROR)
- void batchingIdError(@Cause Exception e);
+ void batchingIdError(Exception e);
@LogMessage(id = 224009, value = "Cannot find message {}", level = LogMessage.Level.ERROR)
void cannotFindMessage(Long id);
@@ -1278,40 +1277,40 @@ public interface ActiveMQServerLogger {
void journalCannotFindQueueScheduled(Long queue, Long id);
@LogMessage(id = 224012, value = "error releasing resources", level = LogMessage.Level.ERROR)
- void largeMessageErrorReleasingResources(@Cause Exception e);
+ void largeMessageErrorReleasingResources(Exception e);
@LogMessage(id = 224014, value = "Failed to close session", level = LogMessage.Level.ERROR)
- void errorClosingSession(@Cause Exception e);
+ void errorClosingSession(Exception e);
@LogMessage(id = 224015, value = "Caught XA exception", level = LogMessage.Level.ERROR)
- void caughtXaException(@Cause Exception e);
+ void caughtXaException(Exception e);
@LogMessage(id = 224016, value = "Caught exception", level = LogMessage.Level.ERROR)
- void caughtException(@Cause Throwable e);
+ void caughtException(Throwable e);
@LogMessage(id = 224017, value = "Invalid packet {}", level = LogMessage.Level.ERROR)
void invalidPacket(Packet packet);
@LogMessage(id = 224018, value = "Failed to create session", level = LogMessage.Level.ERROR)
- void failedToCreateSession(@Cause Exception e);
+ void failedToCreateSession(Exception e);
@LogMessage(id = 224019, value = "Failed to reattach session", level = LogMessage.Level.ERROR)
- void failedToReattachSession(@Cause Exception e);
+ void failedToReattachSession(Exception e);
@LogMessage(id = 224020, value = "Failed to handle create queue", level = LogMessage.Level.ERROR)
- void failedToHandleCreateQueue(@Cause Exception e);
+ void failedToHandleCreateQueue(Exception e);
@LogMessage(id = 224021, value = "Failed to decode packet", level = LogMessage.Level.ERROR)
- void errorDecodingPacket(@Cause Exception e);
+ void errorDecodingPacket(Exception e);
@LogMessage(id = 224022, value = "Failed to execute failure listener", level = LogMessage.Level.ERROR)
- void errorCallingFailureListener(@Cause Throwable e);
+ void errorCallingFailureListener(Throwable e);
@LogMessage(id = 224024, value = "Stomp Error, tx already exist! {}", level = LogMessage.Level.ERROR)
void stompErrorTXExists(String txID);
@LogMessage(id = 224027, value = "Failed to write to handler on invm connector {}", level = LogMessage.Level.ERROR)
- void errorWritingToInvmConnector(Runnable runnable, @Cause Exception e);
+ void errorWritingToInvmConnector(Runnable runnable, Exception e);
@LogMessage(id = 224028, value = "Failed to stop acceptor {}", level = LogMessage.Level.ERROR)
void errorStoppingAcceptor(String name);
@@ -1320,58 +1319,58 @@ public interface ActiveMQServerLogger {
void largeMessageIncompatible();
@LogMessage(id = 224030, value = "Could not cancel reference {}", level = LogMessage.Level.ERROR)
- void errorCancellingRefOnBridge(MessageReference ref2, @Cause Exception e);
+ void errorCancellingRefOnBridge(MessageReference ref2, Exception e);
@LogMessage(id = 224032, value = "Failed to pause bridge", level = LogMessage.Level.ERROR)
- void errorPausingBridge(@Cause Exception e);
+ void errorPausingBridge(Exception e);
@LogMessage(id = 224033, value = "Failed to broadcast connector configs", level = LogMessage.Level.ERROR)
- void errorBroadcastingConnectorConfigs(@Cause Exception e);
+ void errorBroadcastingConnectorConfigs(Exception e);
@LogMessage(id = 224034, value = "Failed to close consumer", level = LogMessage.Level.ERROR)
- void errorClosingConsumer(@Cause Exception e);
+ void errorClosingConsumer(Exception e);
@LogMessage(id = 224035, value = "Failed to close cluster connection flow record", level = LogMessage.Level.ERROR)
- void errorClosingFlowRecord(@Cause Exception e);
+ void errorClosingFlowRecord(Exception e);
@LogMessage(id = 224036, value = "Failed to update cluster connection topology", level = LogMessage.Level.ERROR)
- void errorUpdatingTopology(@Cause Exception e);
+ void errorUpdatingTopology(Exception e);
@LogMessage(id = 224037, value = "cluster connection Failed to handle message", level = LogMessage.Level.ERROR)
- void errorHandlingMessage(@Cause Exception e);
+ void errorHandlingMessage(Exception e);
@LogMessage(id = 224038, value = "Failed to ack old reference", level = LogMessage.Level.ERROR)
- void errorAckingOldReference(@Cause Exception e);
+ void errorAckingOldReference(Exception e);
@LogMessage(id = 224039, value = "Failed to expire message reference", level = LogMessage.Level.ERROR)
- void errorExpiringRef(@Cause Exception e);
+ void errorExpiringRef(Exception e);
@LogMessage(id = 224040, value = "Failed to remove consumer", level = LogMessage.Level.ERROR)
- void errorRemovingConsumer(@Cause Exception e);
+ void errorRemovingConsumer(Exception e);
@LogMessage(id = 224041, value = "Failed to deliver", level = LogMessage.Level.ERROR)
- void errorDelivering(@Cause Exception e);
+ void errorDelivering(Exception e);
@LogMessage(id = 224042, value = "Error while restarting the backup server: {}", level = LogMessage.Level.ERROR)
- void errorRestartingBackupServer(ActiveMQServer backup, @Cause Exception e);
+ void errorRestartingBackupServer(ActiveMQServer backup, Exception e);
@LogMessage(id = 224043, value = "Failed to send forced delivery message", level = LogMessage.Level.ERROR)
- void errorSendingForcedDelivery(@Cause Exception e);
+ void errorSendingForcedDelivery(Exception e);
@LogMessage(id = 224044, value = "error acknowledging message", level = LogMessage.Level.ERROR)
- void errorAckingMessage(@Cause Exception e);
+ void errorAckingMessage(Exception e);
@LogMessage(id = 224045, value = "Failed to run large message deliverer", level = LogMessage.Level.ERROR)
- void errorRunningLargeMessageDeliverer(@Cause Exception e);
+ void errorRunningLargeMessageDeliverer(Exception e);
@LogMessage(id = 224046, value = "Exception while browser handled from {}", level = LogMessage.Level.ERROR)
- void errorBrowserHandlingMessage(MessageReference current, @Cause Exception e);
+ void errorBrowserHandlingMessage(MessageReference current, Exception e);
@LogMessage(id = 224047, value = "Failed to delete large message file", level = LogMessage.Level.ERROR)
- void errorDeletingLargeMessageFile(@Cause Throwable e);
+ void errorDeletingLargeMessageFile(Throwable e);
@LogMessage(id = 224048, value = "Failed to remove temporary queue {}", level = LogMessage.Level.ERROR)
- void errorRemovingTempQueue(SimpleString bindingName, @Cause Exception e);
+ void errorRemovingTempQueue(SimpleString bindingName, Exception e);
@LogMessage(id = 224049, value = "Cannot find consumer with id {}", level = LogMessage.Level.ERROR)
void cannotFindConsumer(long consumerID);
@@ -1380,19 +1379,19 @@ public interface ActiveMQServerLogger {
void errorClosingConnection(ServerSessionImpl serverSession);
@LogMessage(id = 224051, value = "Failed to call notification listener", level = LogMessage.Level.ERROR)
- void errorCallingNotifListener(@Cause Exception e);
+ void errorCallingNotifListener(Exception e);
@LogMessage(id = 224052, value = "Unable to call Hierarchical Repository Change Listener", level = LogMessage.Level.ERROR)
- void errorCallingRepoListener(@Cause Throwable e);
+ void errorCallingRepoListener(Throwable e);
@LogMessage(id = 224053, value = "failed to timeout transaction, xid:{}", level = LogMessage.Level.ERROR)
- void errorTimingOutTX(Xid xid, @Cause Exception e);
+ void errorTimingOutTX(Xid xid, Exception e);
@LogMessage(id = 224054, value = "exception while stopping the replication manager", level = LogMessage.Level.ERROR)
- void errorStoppingReplicationManager(@Cause Throwable t);
+ void errorStoppingReplicationManager(Throwable t);
@LogMessage(id = 224055, value = "Bridge Failed to ack", level = LogMessage.Level.ERROR)
- void bridgeFailedToAck(@Cause Throwable t);
+ void bridgeFailedToAck(Throwable t);
@LogMessage(id = 224056, value = "Live server will not fail-back automatically", level = LogMessage.Level.ERROR)
void autoFailBackDenied();
@@ -1414,29 +1413,29 @@ public interface ActiveMQServerLogger {
void incompatibleWithHAPolicy(String parameter);
@LogMessage(id = 224062, value = "Failed to send SLOW_CONSUMER notification: {}", level = LogMessage.Level.ERROR)
- void failedToSendSlowConsumerNotification(Notification notification, @Cause Exception e);
+ void failedToSendSlowConsumerNotification(Notification notification, Exception e);
@LogMessage(id = 224063, value = "Failed to close consumer connections for address {}", level = LogMessage.Level.ERROR)
- void failedToCloseConsumerConnectionsForAddress(String address, @Cause Exception e);
+ void failedToCloseConsumerConnectionsForAddress(String address, Exception e);
@Deprecated(since = "1.0.0")
@LogMessage(id = 224064, value = "Setting <{}> is invalid with this HA Policy Configuration. Please use <ha-policy> exclusively or remove. Ignoring value.", level = LogMessage.Level.ERROR)
void incompatibleWithHAPolicyChosen(String parameter);
@LogMessage(id = 224065, value = "Failed to remove auto-created {} {}", level = LogMessage.Level.ERROR)
- void errorRemovingAutoCreatedDestination(String destinationType, SimpleString bindingName, @Cause Exception e);
+ void errorRemovingAutoCreatedDestination(String destinationType, SimpleString bindingName, Exception e);
@LogMessage(id = 224066, value = "Error opening context for LDAP", level = LogMessage.Level.ERROR)
- void errorOpeningContextForLDAP(@Cause Exception e);
+ void errorOpeningContextForLDAP(Exception e);
@LogMessage(id = 224067, value = "Error populating security roles from LDAP", level = LogMessage.Level.ERROR)
- void errorPopulatingSecurityRolesFromLDAP(@Cause Exception e);
+ void errorPopulatingSecurityRolesFromLDAP(Exception e);
@LogMessage(id = 224068, value = "Unable to stop component: {}", level = LogMessage.Level.ERROR)
- void errorStoppingComponent(String componentClassName, @Cause Throwable t);
+ void errorStoppingComponent(String componentClassName, Throwable t);
@LogMessage(id = 224069, value = "Change detected in broker configuration file, but reload failed", level = LogMessage.Level.ERROR)
- void configurationReloadFailed(@Cause Throwable t);
+ void configurationReloadFailed(Throwable t);
@LogMessage(id = 224072, value = "Message Counter Sample Period too short: {}", level = LogMessage.Level.WARN)
void invalidMessageCounterPeriod(long value);
@@ -1445,7 +1444,7 @@ public interface ActiveMQServerLogger {
void journalUseMAPPED();
@LogMessage(id = 224074, value = "Failed to purge queue {} on no consumers", level = LogMessage.Level.ERROR)
- void failedToPurgeQueue(SimpleString bindingName, @Cause Exception e);
+ void failedToPurgeQueue(SimpleString bindingName, Exception e);
@LogMessage(id = 224075, value = "Cannot find pageTX id = {}", level = LogMessage.Level.ERROR)
void journalCannotFindPageTX(Long id);
@@ -1469,19 +1468,19 @@ public interface ActiveMQServerLogger {
void duplicateCacheSizeWarning(int idCacheSize, int confirmationWindowSize);
@LogMessage(id = 224082, value = "Failed to invoke an interceptor", level = LogMessage.Level.ERROR)
- void failedToInvokeAnInterceptor(@Cause Exception e);
+ void failedToInvokeAnInterceptor(Exception e);
@LogMessage(id = 224083, value = "Failed to close context", level = LogMessage.Level.ERROR)
- void failedToCloseContext(@Cause Exception e);
+ void failedToCloseContext(Exception e);
@LogMessage(id = 224084, value = "Failed to open context", level = LogMessage.Level.ERROR)
- void failedToOpenContext(@Cause Exception e);
+ void failedToOpenContext(Exception e);
@LogMessage(id = 224085, value = "Failed to load property {}, reason: {}", level = LogMessage.Level.ERROR)
- void failedToLoadProperty(String key, String reason, @Cause Exception e);
+ void failedToLoadProperty(String key, String reason, Exception e);
@LogMessage(id = 224086, value = "Caught unexpected exception", level = LogMessage.Level.ERROR)
- void caughtUnexpectedException(@Cause NamingException e);
+ void caughtUnexpectedException(NamingException e);
@LogMessage(id = 224087, value = "Error announcing backup: backupServerLocator is null. {}", level = LogMessage.Level.ERROR)
void errorAnnouncingBackup(String backupManager);
@@ -1490,7 +1489,7 @@ public interface ActiveMQServerLogger {
void handshakeTimeout(int timeout, String acceptorName, String remoteAddress);
@LogMessage(id = 224089, value = "Failed to calculate persistent size", level = LogMessage.Level.WARN)
- void errorCalculatePersistentSize(@Cause Throwable e);
+ void errorCalculatePersistentSize(Throwable e);
@LogMessage(id = 224090, value = "This node is not configured for Quorum Voting, all nodes must be configured for HA", level = LogMessage.Level.WARN)
void noVoteHandlerConfigured();
@@ -1514,7 +1513,7 @@ public interface ActiveMQServerLogger {
void failedToFindProtocolManager(String remoteAddress, String localAddress, String intendedProtocolManager, String protocolMap);
@LogMessage(id = 224097, value = "Failed to start server", level = LogMessage.Level.ERROR)
- void failedToStartServer(@Cause Throwable t);
+ void failedToStartServer(Throwable t);
@LogMessage(id = 224098, value = "Received a vote saying the backup is live with connector: {}", level = LogMessage.Level.INFO)
void quorumBackupIsLive(String liveConnector);
@@ -1538,10 +1537,10 @@ public interface ActiveMQServerLogger {
void errorStartingAcceptor(String name, Object configuration);
@LogMessage(id = 224105, value = "Connecting to cluster failed", level = LogMessage.Level.WARN)
- void failedConnectingToCluster(@Cause Exception e);
+ void failedConnectingToCluster(Exception e);
@LogMessage(id = 224106, value = "failed to remove transaction, xid:{}", level = LogMessage.Level.ERROR)
- void errorRemovingTX(Xid xid, @Cause Exception e);
+ void errorRemovingTX(Xid xid, Exception e);
@LogMessage(id = 224107, value = "The Critical Analyzer detected slow paths on the broker. It is recommended that you enable trace logs on org.apache.activemq.artemis.utils.critical while you troubleshoot this issue. You should disable the trace logs when you have finished troubleshooting.", level = LogMessage.Level.INFO)
void enableTraceForCriticalAnalyzer();
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
index e9c7d87c27..05198c83ce 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
@@ -18,7 +18,6 @@ package org.apache.activemq.artemis.service.extensions.xa.recovery;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.w3c.dom.Node;
@@ -49,28 +48,28 @@ public interface ActiveMQXARecoveryLogger {
void recoveryConnectFailed(String s);
@LogMessage(id = 172011, value = "error unbinding {} from JNDI", level = LogMessage.Level.WARN)
- void jndiUnbindError(String key, @Cause Exception e);
+ void jndiUnbindError(String key, Exception e);
@LogMessage(id = 172012, value = "JMS Server Manager error", level = LogMessage.Level.WARN)
- void jmsServerError(@Cause Exception e);
+ void jmsServerError(Exception e);
@LogMessage(id = 172013, value = "Error in XA Recovery recover", level = LogMessage.Level.WARN)
- void xaRecoverError(@Cause Exception e);
+ void xaRecoverError(Exception e);
@LogMessage(id = 172014, value = "Notified of connection failure in xa recovery connectionFactory for provider {} will attempt reconnect on next pass",
level = LogMessage.Level.WARN)
- void xaRecoverConnectionError(ClientSessionFactory csf, @Cause Exception e);
+ void xaRecoverConnectionError(ClientSessionFactory csf, Exception e);
@LogMessage(id = 172015, value = "Can not connect to {} on auto-generated resource recovery",
level = LogMessage.Level.WARN)
- void xaRecoverAutoConnectionError(XARecoveryConfig csf, @Cause Throwable e);
+ void xaRecoverAutoConnectionError(XARecoveryConfig csf, Throwable e);
@LogMessage(id = 172016, value = "Error in XA Recovery", level = LogMessage.Level.DEBUG)
- void xaRecoveryError(@Cause Exception e);
+ void xaRecoveryError(Exception e);
@LogMessage(id = 172017, value = "Tried to correct invalid \"host\" value \"0.0.0.0\" for \"{}\" connector, but received an exception.",
level = LogMessage.Level.WARN)
- void failedToCorrectHost(String name, @Cause Exception e);
+ void failedToCorrectHost(String name, Exception e);
@LogMessage(id = 172018, value = "Could not start recovery discovery on {}, we will retry every recovery scan until the server is available",
level = LogMessage.Level.WARN)
@@ -80,5 +79,5 @@ public interface ActiveMQXARecoveryLogger {
void jmsConfigMissingKey(Node e);
@LogMessage(id = 174002, value = "Failed to start JMS deployer", level = LogMessage.Level.ERROR)
- void jmsDeployerStartError(@Cause Exception e);
+ void jmsDeployerStartError(Exception e);
}
[activemq-artemis] 30/42: ensure exceptions/causes are the last arg passed, as the logging framework expects, and processor now enforces
Posted by cl...@apache.org.
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 3da9d6aa78deed551a27e39adf43e17d6c13a685
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jul 21 16:27:41 2022 +0100
ensure exceptions/causes are the last arg passed, as the logging framework expects, and processor now enforces
---
.../artemis/core/server/NetworkHealthCheck.java | 14 ++--
.../activemq/artemis/logs/ActiveMQUtilBundle.java | 2 +-
.../activemq/artemis/logs/ActiveMQUtilLogger.java | 14 ++--
.../artemis/utils/PasswordMaskingUtil.java | 2 +-
.../api/core/UDPBroadcastEndpointFactory.java | 2 +-
.../artemis/core/client/ActiveMQClientLogger.java | 10 +--
.../core/protocol/core/impl/ChannelImpl.java | 2 +-
.../jms/client/ActiveMQJMSClientBundle.java | 2 +-
.../artemis/jms/client/ActiveMQSession.java | 2 +-
.../jms/bridge/ActiveMQJMSBridgeLogger.java | 8 +-
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 16 ++--
.../jms/server/ActiveMQJMSServerLogger.java | 6 +-
.../jms/server/impl/JMSServerManagerImpl.java | 4 +-
.../activemq/artemis/core/io/DummyCallback.java | 2 +-
.../core/journal/impl/JournalFilesRepository.java | 2 +-
.../artemis/core/journal/impl/JournalImpl.java | 2 +-
.../artemis/journal/ActiveMQJournalLogger.java | 8 +-
.../protocol/amqp/broker/AMQPLargeMessage.java | 2 +-
.../stomp/ActiveMQStompProtocolLogger.java | 2 +-
.../core/protocol/stomp/StompProtocolManager.java | 2 +-
.../activemq/artemis/ra/ActiveMQRALogger.java | 4 +-
.../artemis/ra/inflow/ActiveMQActivation.java | 4 +-
.../activemq/artemis/rest/ActiveMQRestLogger.java | 2 +-
.../artemis/rest/queue/push/FilePushStore.java | 2 +-
.../activemq/artemis/osgi/ActiveMQOsgiLogger.java | 4 +-
.../activemq/artemis/osgi/DataSourceTracker.java | 4 +-
.../activemq/artemis/osgi/ProtocolTracker.java | 6 +-
.../artemis/core/filter/impl/FilterImpl.java | 2 +-
.../paging/cursor/impl/PageCursorProviderImpl.java | 6 +-
.../core/paging/impl/PageTransactionInfoImpl.java | 2 +-
.../journal/AbstractJournalStorageManager.java | 4 +-
.../impl/journal/JournalStorageManager.java | 4 +-
.../impl/journal/LargeServerMessageImpl.java | 2 +-
.../TXLargeMessageConfirmationOperation.java | 2 +-
.../core/postoffice/impl/PostOfficeImpl.java | 2 +-
.../core/remoting/impl/invm/InVMConnection.java | 2 +-
.../remoting/server/impl/RemotingServiceImpl.java | 2 +-
.../core/replication/ReplicationEndpoint.java | 6 +-
.../artemis/core/server/ActiveMQMessageBundle.java | 4 +-
.../artemis/core/server/ActiveMQServerLogger.java | 96 +++++++++++-----------
.../core/server/cluster/ClusterManager.java | 8 +-
.../core/server/cluster/impl/BridgeImpl.java | 12 +--
.../federation/AbstractFederationStream.java | 4 +-
.../core/server/federation/FederatedAbstract.java | 8 +-
.../federation/FederatedQueueConsumerImpl.java | 6 +-
.../federation/address/FederatedAddress.java | 10 +--
.../server/federation/queue/FederatedQueue.java | 2 +-
.../server/group/impl/LocalGroupingHandler.java | 8 +-
.../core/server/impl/ActiveMQServerImpl.java | 16 ++--
.../core/server/impl/ConnectorsService.java | 4 +-
.../core/server/impl/FileBasedNodeManager.java | 4 +-
.../core/server/impl/PostOfficeJournalLoader.java | 2 +-
.../artemis/core/server/impl/QueueImpl.java | 8 +-
.../artemis/core/server/impl/QueueManagerImpl.java | 4 +-
.../server/impl/ReplicationBackupActivation.java | 2 +-
.../server/impl/ReplicationPrimaryActivation.java | 2 +-
.../core/server/impl/ServerConsumerImpl.java | 6 +-
.../core/server/impl/ServerSessionImpl.java | 2 +-
.../core/server/impl/ServiceRegistryImpl.java | 2 +-
.../server/impl/SharedNothingBackupActivation.java | 2 +-
.../server/impl/SharedNothingLiveActivation.java | 2 +-
.../server/impl/TransientQueueManagerImpl.java | 2 +-
.../management/impl/ManagementServiceImpl.java | 4 +-
.../core/transaction/impl/ResourceManagerImpl.java | 4 +-
.../security/ActiveMQBasicSecurityManager.java | 2 +-
.../core/security/jaas/ReloadableProperties.java | 2 +-
.../xa/recovery/ActiveMQXARecoveryLogger.java | 8 +-
.../xa/recovery/ActiveMQXAResourceWrapper.java | 4 +-
68 files changed, 202 insertions(+), 202 deletions(-)
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
index 5916eb9b96..9e3a0ef28b 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
@@ -88,7 +88,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
netToUse = null;
}
} catch (Exception e) {
- ActiveMQUtilLogger.LOGGER.failedToSetNIC(e, nicName);
+ ActiveMQUtilLogger.LOGGER.failedToSetNIC(nicName, e);
netToUse = null;
}
@@ -131,7 +131,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
String strAddress = address.trim();
this.addAddress(strAddress);
} catch (Exception e) {
- ActiveMQUtilLogger.LOGGER.failedToParseAddressList(e, addressList);
+ ActiveMQUtilLogger.LOGGER.failedToParseAddressList(addressList, e);
}
}
}
@@ -149,7 +149,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
try {
this.addURL(new URL(address.trim()));
} catch (Exception e) {
- ActiveMQUtilLogger.LOGGER.failedToParseUrlList(e, addressList);
+ ActiveMQUtilLogger.LOGGER.failedToParseUrlList(addressList, e);
}
}
}
@@ -289,7 +289,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
ActiveMQUtilLogger.LOGGER.startingService(component.toString());
component.start();
} catch (Exception e) {
- ActiveMQUtilLogger.LOGGER.errorStartingComponent(e, component.toString());
+ ActiveMQUtilLogger.LOGGER.errorStartingComponent(component.toString(), e);
}
}
ownShutdown = false;
@@ -302,7 +302,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
ActiveMQUtilLogger.LOGGER.stoppingService(component.toString());
component.stop();
} catch (Exception e) {
- ActiveMQUtilLogger.LOGGER.errorStoppingComponent(e, component.toString());
+ ActiveMQUtilLogger.LOGGER.errorStoppingComponent(component.toString(), e);
}
}
}
@@ -351,7 +351,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
return null;
}
} catch (Exception e) {
- ActiveMQUtilLogger.LOGGER.failedToCheckAddress(e, straddress);
+ ActiveMQUtilLogger.LOGGER.failedToCheckAddress(straddress, e);
return null;
}
}
@@ -433,7 +433,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
is.close();
return true;
} catch (Exception e) {
- ActiveMQUtilLogger.LOGGER.failedToCheckURL(e, url.toString());
+ ActiveMQUtilLogger.LOGGER.failedToCheckURL(url.toString(), e);
return false;
}
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
index bce2df7d1b..a04c138e97 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
@@ -44,7 +44,7 @@ public interface ActiveMQUtilBundle {
IllegalStateException stringTooLong(Integer length);
@Message(id = 209003, value = "Error instantiating codec {}")
- IllegalArgumentException errorCreatingCodec(@Cause Exception e, String codecClassName);
+ IllegalArgumentException errorCreatingCodec(String codecClassName, @Cause Exception e);
@Message(id = 209004, value = "Failed to parse long value from {}")
IllegalArgumentException failedToParseLong(String value);
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 7fa668976f..d31c4f70b7 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
@@ -48,25 +48,25 @@ public interface ActiveMQUtilLogger {
void urlWasntReacheable(String url);
@LogMessage(id = 202004, value = "Error starting component {} ", level = LogMessage.Level.WARN)
- void errorStartingComponent(@Cause Exception e, String component);
+ void errorStartingComponent(String component, @Cause Exception e);
@LogMessage(id = 202005, value = "Error stopping component {} ", level = LogMessage.Level.WARN)
- void errorStoppingComponent(@Cause Exception e, String component);
+ void errorStoppingComponent(String component, @Cause Exception e);
@LogMessage(id = 202006, value = "Failed to check Url {}.", level = LogMessage.Level.WARN)
- void failedToCheckURL(@Cause Exception e, String url);
+ void failedToCheckURL(String url, @Cause Exception e);
@LogMessage(id = 202007, value = "Failed to check Address {}.", level = LogMessage.Level.WARN)
- void failedToCheckAddress(@Cause Exception e, String address);
+ void failedToCheckAddress(String address, @Cause Exception e);
@LogMessage(id = 202008, value = "Failed to check Address list {}.", level = LogMessage.Level.WARN)
- void failedToParseAddressList(@Cause Exception e, String addressList);
+ void failedToParseAddressList(String addressList, @Cause Exception e);
@LogMessage(id = 202009, value = "Failed to check Url list {}.", level = LogMessage.Level.WARN)
- void failedToParseUrlList(@Cause Exception e, String urlList);
+ void failedToParseUrlList(String urlList, @Cause Exception e);
@LogMessage(id = 202010, value = "Failed to set NIC {}.", level = LogMessage.Level.WARN)
- void failedToSetNIC(@Cause Exception e, String nic);
+ void failedToSetNIC(String nic, @Cause Exception e);
@LogMessage(id = 202011, value = "Failed to read from stream {}.", level = LogMessage.Level.WARN)
void failedToReadFromStream(String stream);
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
index 2287e5303d..5125a575ad 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
@@ -198,7 +198,7 @@ public final class PasswordMaskingUtil {
// As a last resort, load the codec class using the current thread's context class loader
return (SensitiveDataCodec<String>) Thread.currentThread().getContextClassLoader().loadClass(codecClassName).newInstance();
} catch (Exception e2) {
- throw ActiveMQUtilBundle.BUNDLE.errorCreatingCodec(e2, codecClassName);
+ throw ActiveMQUtilBundle.BUNDLE.errorCreatingCodec(codecClassName, e2);
}
}
});
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java
index c447a8dfc3..08b8c30f30 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java
@@ -155,7 +155,7 @@ public final class UDPBroadcastEndpointFactory implements BroadcastEndpointFacto
continue;
} catch (IOException e) {
if (open) {
- ActiveMQClientLogger.LOGGER.unableToReceiveBroadcast(e, this.toString());
+ ActiveMQClientLogger.LOGGER.unableToReceiveBroadcast(this.toString(), e);
}
}
break;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index 2389dabbe9..8f27c585a7 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -53,7 +53,7 @@ public interface ActiveMQClientLogger {
void createConnectorException(@Cause Exception e);
@LogMessage(id = 212008, value = "I am closing a core ClientSessionFactory you left open. Please make sure you close all ClientSessionFactories explicitly " + "before letting them go out of scope! {}", level = LogMessage.Level.WARN)
- void factoryLeftOpen(@Cause Exception e, int i);
+ void factoryLeftOpen(int i, @Cause Exception e);
@LogMessage(id = 212009, value = "resetting session after failure", level = LogMessage.Level.WARN)
void resettingSessionAfterFailure();
@@ -74,7 +74,7 @@ public interface ActiveMQClientLogger {
void errorDuringPrepare(@Cause Throwable e);
@LogMessage(id = 212016, value = "I am closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly before letting them go out of scope! {}", level = LogMessage.Level.WARN)
- void clientSessionNotClosed(@Cause Exception e, int identity);
+ void clientSessionNotClosed(int identity, @Cause Exception e);
@LogMessage(id = 212017, value = "error adding packet", level = LogMessage.Level.WARN)
void errorAddingPacket(@Cause Exception e);
@@ -138,7 +138,7 @@ public interface ActiveMQClientLogger {
void connectionFailureDetected(String remoteAddress, String message, ActiveMQExceptionType type);
@LogMessage(id = 212038, value = "Failure in calling interceptor: {}", level = LogMessage.Level.WARN)
- void errorCallingInterceptor(@Cause Throwable e, Interceptor interceptor);
+ void errorCallingInterceptor(Interceptor interceptor, @Cause Throwable e);
@LogMessage(id = 212040, value = "Timed out waiting for netty ssl close future to complete", level = LogMessage.Level.WARN)
void timeoutClosingSSL();
@@ -221,7 +221,7 @@ public interface ActiveMQClientLogger {
void unableToReceiveClusterTopology(@Cause Throwable e);
@LogMessage(id = 212065, value = "{} getting exception when receiving broadcasting ", level = LogMessage.Level.WARN)
- void unableToReceiveBroadcast(@Cause Exception e, String target);
+ void unableToReceiveBroadcast(String target, @Cause Exception e);
@LogMessage(id = 212066, value = "failed to parse int property ", level = LogMessage.Level.WARN)
void unableToParseValue(@Cause Throwable e);
@@ -314,7 +314,7 @@ public interface ActiveMQClientLogger {
void caughtunexpectedThrowable(@Cause Throwable t);
@LogMessage(id = 214018, value = "Failed to invoke getTextContent() on node {}", level = LogMessage.Level.ERROR)
- void errorOnXMLTransform(@Cause Throwable t, Node n);
+ void errorOnXMLTransform(Node n, @Cause Throwable t);
@LogMessage(id = 214019, value = "Invalid configuration", level = LogMessage.Level.ERROR)
void errorOnXMLTransformInvalidConf(@Cause Throwable t);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
index 02b7ebc093..3edd9beee6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
@@ -589,7 +589,7 @@ public final class ChannelImpl implements Channel {
return interceptor.getClass().getName();
}
} catch (final Throwable e) {
- ActiveMQClientLogger.LOGGER.errorCallingInterceptor(e, interceptor);
+ ActiveMQClientLogger.LOGGER.errorCallingInterceptor(interceptor, e);
}
}
}
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java
index cb376888d7..9f9a642ba8 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java
@@ -46,7 +46,7 @@ public interface ActiveMQJMSClientBundle {
ActiveMQJMSClientBundle BUNDLE = CodeFactory.getCodeClass(ActiveMQJMSClientBundle.class);
@Message(id = 139000, value = "Invalid filter: {}")
- ActiveMQInvalidFilterExpressionException invalidFilter(@Cause Throwable e, SimpleString filter);
+ ActiveMQInvalidFilterExpressionException invalidFilter(SimpleString filter, @Cause Throwable e);
@Message(id = 139001, value = "Invalid Subscription Name. It is required to set the subscription name")
ActiveMQIllegalStateException invalidSubscriptionName();
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index 35d8060574..74c2ccddce 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -961,7 +961,7 @@ public class ActiveMQSession implements QueueSession, TopicSession {
SelectorParser.parse(filterString.trim());
}
} catch (FilterException e) {
- throw JMSExceptionHelper.convertFromActiveMQException(ActiveMQJMSClientBundle.BUNDLE.invalidFilter(e, new SimpleString(filterString)));
+ throw JMSExceptionHelper.convertFromActiveMQException(ActiveMQJMSClientBundle.BUNDLE.invalidFilter(new SimpleString(filterString), e));
}
ActiveMQDestination activeMQDestination = (ActiveMQDestination) queue;
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
index 7c87eb7e21..8c75b5d4f9 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
@@ -59,19 +59,19 @@ public interface ActiveMQJMSBridgeLogger {
void bridgeNotStarted(String bridgeName);
@LogMessage(id = 342006, value = "JMS Bridge {}, detected failure on bridge connection", level = LogMessage.Level.WARN)
- void bridgeFailure(@Cause Exception e, String bridgeName);
+ void bridgeFailure(String bridgeName, @Cause Exception e);
@LogMessage(id = 342009, value = "JMS Bridge {} failed to send + acknowledge batch, closing JMS objects", level = LogMessage.Level.WARN)
- void bridgeAckError(@Cause Exception e, String bridgeName);
+ void bridgeAckError(String bridgeName, @Cause Exception e);
@LogMessage(id = 342010, value = "Failed to connect JMS Bridge {}", level = LogMessage.Level.WARN)
- void bridgeConnectError(@Cause Exception e, String bridgeName);
+ void bridgeConnectError(String bridgeName, @Cause Exception e);
@LogMessage(id = 342011, value = "Transaction rolled back, retrying TX", level = LogMessage.Level.WARN)
void transactionRolledBack(@Cause Exception e);
@LogMessage(id = 344001, value = "JMS Bridge {}, failed to start source connection", level = LogMessage.Level.ERROR)
- void jmsBridgeSrcConnectError(@Cause Exception e, String bridgeName);
+ void jmsBridgeSrcConnectError(String bridgeName, @Cause Exception e);
@LogMessage(id = 344002, value = "Failed to start JMS Bridge {}. QoS Mode: {} requires a Transaction Manager, none found", level = LogMessage.Level.ERROR)
void jmsBridgeTransactionManagerMissing(String bridgeName, QualityOfServiceMode qosMode);
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index 403c96b5cd..aff9967368 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -1306,7 +1306,7 @@ public final class JMSBridgeImpl implements JMSBridge {
// If this fails we should attempt to cleanup or we might end up in some weird state
// Adding a log.warn, so the use may see the cause of the failure and take actions
- ActiveMQJMSBridgeLogger.LOGGER.bridgeConnectError(e, bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeConnectError(bridgeName, e);
cleanup();
@@ -1495,7 +1495,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
} catch (Exception e) {
if (!stopping) {
- ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e, bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(bridgeName, e);
}
// We don't call failure otherwise failover would be broken with ActiveMQ
@@ -1539,7 +1539,7 @@ public final class JMSBridgeImpl implements JMSBridge {
} catch (Throwable ignored) {
}
- ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e, bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(bridgeName, e);
//we don't do handle failure here because the tx
//may be rolledback due to failover. All failure handling
@@ -1555,7 +1555,7 @@ public final class JMSBridgeImpl implements JMSBridge {
messages.clear();
} catch (Exception e) {
- ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e, bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(bridgeName, e);
handleFailureOnSend();
}
@@ -1577,7 +1577,7 @@ public final class JMSBridgeImpl implements JMSBridge {
}
} catch (Exception e) {
- ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e, bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(bridgeName, e);
try {
sourceSession.rollback();
@@ -1846,7 +1846,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
sourceConn.start();
} catch (JMSException e) {
- ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e, bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(bridgeName, e);
}
}
@@ -1932,7 +1932,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
startSource();
} catch (JMSException e) {
- ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e, bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(bridgeName, e);
}
}
}
@@ -2019,7 +2019,7 @@ public final class JMSBridgeImpl implements JMSBridge {
if (stopping) {
return;
}
- ActiveMQJMSBridgeLogger.LOGGER.bridgeFailure(e, bridgeName);
+ ActiveMQJMSBridgeLogger.LOGGER.bridgeFailure(bridgeName, e);
if (isSource) {
connectedSource = false;
} else {
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
index 5fa7f20bd7..3ceb87dee5 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
@@ -49,7 +49,7 @@ public interface ActiveMQJMSServerLogger {
void recoveryConnectFailed(String s);
@LogMessage(id = 122011, value = "error unbinding {} from Registry", level = LogMessage.Level.WARN)
- void bindingsUnbindError(@Cause Exception e, String key);
+ void bindingsUnbindError(String key, @Cause Exception e);
@LogMessage(id = 122012, value = "JMS Server Manager error", level = LogMessage.Level.WARN)
void jmsServerError(@Cause Exception e);
@@ -59,14 +59,14 @@ public interface ActiveMQJMSServerLogger {
@LogMessage(id = 122014, value = "Notified of connection failure in xa recovery connectionFactory for provider {} will attempt reconnect on next pass",
level = LogMessage.Level.WARN)
- void xaRecoverConnectionError(@Cause Exception e, ClientSessionFactory csf);
+ void xaRecoverConnectionError(ClientSessionFactory csf, @Cause Exception e);
@LogMessage(id = 122016, value = "Error in XA Recovery", level = LogMessage.Level.DEBUG)
void xaRecoveryError(@Cause Exception e);
@LogMessage(id = 122017, value = "Tried to correct invalid \"host\" value \"0.0.0.0\" for \"{}\" connector, but received an exception.",
level = LogMessage.Level.WARN)
- void failedToCorrectHost(@Cause Exception e, String name);
+ void failedToCorrectHost(String name, @Cause Exception e);
@LogMessage(id = 122018,
value = "Failed to send notification: {}",
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index 160817824f..e256237f1a 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -1398,7 +1398,7 @@ public class JMSServerManagerImpl extends CleaningActivateCallback implements JM
try {
registry.unbind(key);
} catch (Exception e) {
- ActiveMQJMSServerLogger.LOGGER.bindingsUnbindError(e, key);
+ ActiveMQJMSServerLogger.LOGGER.bindingsUnbindError(key, e);
}
}
}
@@ -1523,7 +1523,7 @@ public class JMSServerManagerImpl extends CleaningActivateCallback implements JM
ActiveMQJMSServerLogger.LOGGER.invalidHostForConnector(transportConfiguration.getName(), newHost);
params.put(TransportConstants.HOST_PROP_NAME, newHost);
} catch (UnknownHostException e) {
- ActiveMQJMSServerLogger.LOGGER.failedToCorrectHost(e, transportConfiguration.getName());
+ ActiveMQJMSServerLogger.LOGGER.failedToCorrectHost(transportConfiguration.getName(), e);
}
}
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/DummyCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/DummyCallback.java
index 2ee5186f6d..9679269309 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/DummyCallback.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/DummyCallback.java
@@ -33,7 +33,7 @@ public class DummyCallback extends SyncIOCompletion {
@Override
public void onError(final int errorCode, final String errorMessage) {
- ActiveMQJournalLogger.LOGGER.errorWritingData(new Exception(errorMessage), errorMessage, errorCode);
+ ActiveMQJournalLogger.LOGGER.errorWritingData(errorMessage, errorCode, new Exception(errorMessage));
}
@Override
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
index d7bd882248..97e9b58458 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
@@ -713,7 +713,7 @@ public class JournalFilesRepository {
try {
return Long.parseLong(fileName.substring(fileName.lastIndexOf("-") + 1, fileName.indexOf('.')));
} catch (Throwable e2) {
- ActiveMQJournalLogger.LOGGER.errorRetrievingID(e, fileName);
+ ActiveMQJournalLogger.LOGGER.errorRetrievingID(fileName, e);
}
return 0;
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
index 06b98c6a59..20940392ed 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
@@ -3079,7 +3079,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
try {
filesRepository.addFreeFile(file, false);
} catch (Throwable e) {
- ActiveMQJournalLogger.LOGGER.errorReinitializingFile(e, file);
+ ActiveMQJournalLogger.LOGGER.errorReinitializingFile(file, e);
}
}
} finally {
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
index 75f8826283..0d5879d414 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
@@ -133,7 +133,7 @@ public interface ActiveMQJournalLogger {
void timeoutOnPollerShutdown(@Cause Exception e);
@LogMessage(id = 142023, value = "Executor on file {} couldn't complete its tasks in 60 seconds.", level = LogMessage.Level.WARN)
- void couldNotCompleteTask(@Cause Exception e, String name);
+ void couldNotCompleteTask(String name, @Cause Exception e);
@LogMessage(id = 142024, value = "Error completing callback", level = LogMessage.Level.WARN)
void errorCompletingCallback(@Cause Throwable e);
@@ -145,7 +145,7 @@ public interface ActiveMQJournalLogger {
void timeoutOnWriterShutdown(@Cause Throwable e);
@LogMessage(id = 142027, value = "Error on writing data! {} code - {}", level = LogMessage.Level.WARN)
- void errorWritingData(@Cause Throwable e, String errorMessage, Integer errorCode);
+ void errorWritingData(String errorMessage, int errorCode, @Cause Throwable e);
@LogMessage(id = 142028, value = "Error replaying pending commands after compacting", level = LogMessage.Level.WARN)
void errorReplayingCommands(@Cause Throwable e);
@@ -157,13 +157,13 @@ public interface ActiveMQJournalLogger {
void errorOpeningFile(@Cause Throwable e);
@LogMessage(id = 142031, value = "Error retrieving ID part of the file name {}", level = LogMessage.Level.WARN)
- void errorRetrievingID(@Cause Throwable e, String fileName);
+ void errorRetrievingID(String fileName, @Cause Throwable e);
@LogMessage(id = 142032, value = "Error reading journal file", level = LogMessage.Level.WARN)
void errorReadingFile(@Cause Throwable e);
@LogMessage(id = 142033, value = "Error reinitializing file {}", level = LogMessage.Level.WARN)
- void errorReinitializingFile(@Cause Throwable e, JournalFile file);
+ void errorReinitializingFile(JournalFile file, @Cause Throwable e);
@LogMessage(id = 142034, value = "Exception on submitting write", level = LogMessage.Level.WARN)
void errorSubmittingWrite(@Cause Throwable e);
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
index a80aa2663c..ec86311338 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
@@ -515,7 +515,7 @@ public class AMQPLargeMessage extends AMQPMessage implements LargeServerMessage
return copy;
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.lareMessageErrorCopying(e, this);
+ ActiveMQServerLogger.LOGGER.lareMessageErrorCopying(this, e);
return null;
}
}
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java
index 03493e1d41..e1638e38fd 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java
@@ -48,5 +48,5 @@ public interface ActiveMQStompProtocolLogger {
void sentErrorToClient(String address, String message);
@LogMessage(id = 334023, value = "Unable to send frame {}", level = LogMessage.Level.ERROR)
- void errorSendingFrame(@Cause Exception e, StompFrame frame);
+ void errorSendingFrame(StompFrame frame, @Cause Exception e);
}
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
index 1f83b02a68..3fa7fd76e9 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
@@ -209,7 +209,7 @@ public class StompProtocolManager extends AbstractProtocolManager<StompFrame, St
try {
connection.physicalSend(frame);
} catch (Exception e) {
- ActiveMQStompProtocolLogger.LOGGER.errorSendingFrame(e, frame);
+ ActiveMQStompProtocolLogger.LOGGER.errorSendingFrame(frame, e);
return false;
}
return true;
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
index 0bd6680bb9..fe65766839 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
@@ -75,7 +75,7 @@ public interface ActiveMQRALogger {
void handlingJMSFailure(@Cause Exception e);
@LogMessage(id = 152005, value = "Failure in broker activation {}", level = LogMessage.Level.WARN)
- void failureInActivation(@Cause Throwable t, ActiveMQActivationSpec spec);
+ void failureInActivation(ActiveMQActivationSpec spec, @Cause Throwable t);
@LogMessage(id = 152006, value = "Unable to call after delivery", level = LogMessage.Level.WARN)
void unableToCallAfterDelivery(@Cause Exception e);
@@ -102,7 +102,7 @@ public interface ActiveMQRALogger {
void errorStoppingRA(@Cause Exception e);
@LogMessage(id = 154003, value = "Unable to reconnect {}", level = LogMessage.Level.ERROR)
- void errorReconnecting(@Cause Throwable t, ActiveMQActivationSpec spec);
+ void errorReconnecting(ActiveMQActivationSpec spec, @Cause Throwable t);
@LogMessage(id = 154004, value = "Failed to deliver message", level = LogMessage.Level.ERROR)
void errorDeliveringMessage(@Cause Throwable t);
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
index fe81e3c3b7..4947d6681f 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
@@ -706,7 +706,7 @@ public class ActiveMQActivation {
} else if (failure instanceof ActiveMQException && ((ActiveMQException) failure).getType() == ActiveMQExceptionType.NOT_CONNECTED) {
ActiveMQRALogger.LOGGER.awaitingJMSServerCreation();
} else {
- ActiveMQRALogger.LOGGER.failureInActivation(failure, spec);
+ ActiveMQRALogger.LOGGER.failureInActivation(spec, failure);
}
}
int reconnectCount = 0;
@@ -747,7 +747,7 @@ public class ActiveMQActivation {
ActiveMQRALogger.LOGGER.awaitingJMSServerCreation();
}
} else {
- ActiveMQRALogger.LOGGER.errorReconnecting(t, spec);
+ ActiveMQRALogger.LOGGER.errorReconnecting(spec, t);
}
}
++reconnectCount;
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
index 3ae22311f8..77fd74ddf5 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
@@ -57,7 +57,7 @@ public interface ActiveMQRestLogger {
void deprecatedConfiguration(String oldConfigParameter, String newConfigParameter);
@LogMessage(id = 184000, value = "Failed to load push store {}, it is probably corrupted", level = LogMessage.Level.ERROR)
- void errorLoadingStore(@Cause Exception e, String name);
+ void errorLoadingStore(String name, @Cause Exception e);
@LogMessage(id = 184001, value = "Error updating store", level = LogMessage.Level.ERROR)
void errorUpdatingStore(@Cause Exception e);
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java
index d788cefd39..77ad60a1de 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java
@@ -50,7 +50,7 @@ public class FilePushStore implements PushStore {
ActiveMQRestLogger.LOGGER.addingPushRegistration(reg.getId());
map.put(reg.getId(), reg);
} catch (Exception e) {
- ActiveMQRestLogger.LOGGER.errorLoadingStore(e, file.getName());
+ ActiveMQRestLogger.LOGGER.errorLoadingStore(file.getName(), e);
}
}
}
diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
index 9c12a52b37..52e88484f2 100644
--- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
+++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
@@ -42,10 +42,10 @@ public interface ActiveMQOsgiLogger {
void protocolWasRemovedForBroker(String protocol, String name, String message);
@LogMessage(id = 582000, value = "Error starting broker: {}", level = LogMessage.Level.WARN)
- void errorStartingBroker(@Cause Exception e, String name);
+ void errorStartingBroker(String name, @Cause Exception e);
@LogMessage(id = 582001, value = "Error stopping broker: {}", level = LogMessage.Level.WARN)
- void errorStoppingBroker(@Cause Exception e, String name);
+ void errorStoppingBroker(String name, @Cause Exception e);
@LogMessage(id = 582002, value = "Error getting dataSource provider infos.", level = LogMessage.Level.WARN)
void errorGettingDataSourceProviderInfo(@Cause Exception e);
diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java
index bfc7362402..03b0d3931c 100644
--- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java
+++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java
@@ -54,7 +54,7 @@ public class DataSourceTracker implements ServiceTrackerCustomizer<DataSource, D
try {
callback.start();
} catch (Exception ex) {
- ActiveMQOsgiLogger.LOGGER.errorStartingBroker(ex, name);
+ ActiveMQOsgiLogger.LOGGER.errorStartingBroker(name, ex);
}
return dataSource;
}
@@ -70,7 +70,7 @@ public class DataSourceTracker implements ServiceTrackerCustomizer<DataSource, D
try {
callback.stop();
} catch (Exception ex) {
- ActiveMQOsgiLogger.LOGGER.errorStoppingBroker(ex, name);
+ ActiveMQOsgiLogger.LOGGER.errorStoppingBroker(name, ex);
}
}
}
diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java
index 8e091291be..5161640d82 100644
--- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java
+++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java
@@ -65,7 +65,7 @@ public class ProtocolTracker implements ServiceTrackerCustomizer<ProtocolManager
try {
callback.start();
} catch (Exception e) {
- ActiveMQOsgiLogger.LOGGER.errorStartingBroker(e, name);
+ ActiveMQOsgiLogger.LOGGER.errorStartingBroker(name, e);
}
}
}
@@ -106,7 +106,7 @@ public class ProtocolTracker implements ServiceTrackerCustomizer<ProtocolManager
try {
callback.start();
} catch (Exception e) {
- ActiveMQOsgiLogger.LOGGER.errorStartingBroker(e, name);
+ ActiveMQOsgiLogger.LOGGER.errorStartingBroker(name, e);
}
}
}
@@ -121,7 +121,7 @@ public class ProtocolTracker implements ServiceTrackerCustomizer<ProtocolManager
try {
callback.stop();
} catch (Exception e) {
- ActiveMQOsgiLogger.LOGGER.errorStoppingBroker(e, name);
+ ActiveMQOsgiLogger.LOGGER.errorStoppingBroker(name, e);
}
}
this.protocols.put(protocol, false);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
index 3f183a53f7..b4b7d9dfff 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
@@ -88,7 +88,7 @@ public class FilterImpl implements Filter {
if (logger.isDebugEnabled()) {
logger.debug("Invalid filter", e);
}
- throw ActiveMQMessageBundle.BUNDLE.invalidFilter(e, filterStr);
+ throw ActiveMQMessageBundle.BUNDLE.invalidFilter(filterStr, e);
}
return new FilterImpl(filterStr, booleanExpression);
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
index 200593243b..c1a8475577 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
@@ -206,7 +206,7 @@ public class PageCursorProviderImpl implements PageCursorProvider {
try {
sub.onPageModeCleared(tx);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorCleaningPagingOnQueue(e, sub.getQueue().getName().toString());
+ ActiveMQServerLogger.LOGGER.errorCleaningPagingOnQueue(sub.getQueue().getName().toString(), e);
}
}
@@ -290,7 +290,7 @@ public class PageCursorProviderImpl implements PageCursorProvider {
}
}
} catch (Exception ex) {
- ActiveMQServerLogger.LOGGER.problemCleaningPageAddress(ex, pagingStore.getAddress());
+ ActiveMQServerLogger.LOGGER.problemCleaningPageAddress(pagingStore.getAddress(), ex);
logger.warn(ex.getMessage(), ex);
return;
} finally {
@@ -441,7 +441,7 @@ public class PageCursorProviderImpl implements PageCursorProvider {
onDeletePage(depagedPage);
}
} catch (Exception ex) {
- ActiveMQServerLogger.LOGGER.problemCleaningPageAddress(ex, pagingStore.getAddress());
+ ActiveMQServerLogger.LOGGER.problemCleaningPageAddress(pagingStore.getAddress(), ex);
return;
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
index 261ec4572f..8c96074b5e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
@@ -105,7 +105,7 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo {
try {
storageManager.deletePageTransactional(this.recordID);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.pageTxDeleteError(e, recordID);
+ ActiveMQServerLogger.LOGGER.pageTxDeleteError(recordID, e);
}
}
if (pagingManager != null) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index b5870a521e..41b1174457 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -459,7 +459,7 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
private void messageUpdateCallback(long id, boolean found) {
if (!found) {
- ActiveMQServerLogger.LOGGER.cannotFindMessageOnJournal(new Exception(), id);
+ ActiveMQServerLogger.LOGGER.cannotFindMessageOnJournal(id, new Exception());
}
}
@@ -1283,7 +1283,7 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
} catch (Throwable ignored) {
}
- ActiveMQServerLogger.LOGGER.failedToLoadPreparedTX(e, String.valueOf(encodingXid != null ? encodingXid.xid : null));
+ ActiveMQServerLogger.LOGGER.failedToLoadPreparedTX(String.valueOf(encodingXid != null ? encodingXid.xid : null), e);
try {
rollback(txInfo.getId());
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
index 075461f942..b1e79b400c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
@@ -342,7 +342,7 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
try {
msg.delete();
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.journalErrorDeletingMessage(e, messageId);
+ ActiveMQServerLogger.LOGGER.journalErrorDeletingMessage(messageId, e);
}
if (replicator != null) {
replicator.largeMessageDelete(messageId, JournalStorageManager.this);
@@ -511,7 +511,7 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
confirmLargeMessage(largeServerMessage);
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.journalErrorDeletingMessage(e, largeServerMessage.toMessage().getMessageID());
+ ActiveMQServerLogger.LOGGER.journalErrorDeletingMessage(largeServerMessage.toMessage().getMessageID(), e);
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
index 63fe38b592..9501c5d2ae 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
@@ -307,7 +307,7 @@ public final class LargeServerMessageImpl extends CoreMessage implements CoreLar
return newMessage.toMessage();
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.lareMessageErrorCopying(e, this);
+ ActiveMQServerLogger.LOGGER.lareMessageErrorCopying(this, e);
return null;
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/TXLargeMessageConfirmationOperation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/TXLargeMessageConfirmationOperation.java
index 9e252e97d8..5b34a327fa 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/TXLargeMessageConfirmationOperation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/TXLargeMessageConfirmationOperation.java
@@ -38,7 +38,7 @@ public final class TXLargeMessageConfirmationOperation extends TransactionOperat
try {
journalStorageManager.confirmPendingLargeMessage(msg);
} catch (Throwable e) {
- ActiveMQServerLogger.LOGGER.journalErrorConfirmingLargeMessage(e, msg);
+ ActiveMQServerLogger.LOGGER.journalErrorConfirmingLargeMessage(msg, e);
}
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index 73bda80942..e5fd7b1b72 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -1953,7 +1953,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
// that the address is removed before the reaper removes it
logger.debug(e.getMessage(), e);
} else {
- ActiveMQServerLogger.LOGGER.errorRemovingAutoCreatedDestination(e, "address", address);
+ ActiveMQServerLogger.LOGGER.errorRemovingAutoCreatedDestination("address", address, e);
}
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java
index eba1628f62..9a1618a85c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java
@@ -214,7 +214,7 @@ public class InVMConnection implements Connection {
}
} catch (Exception e) {
final String msg = "Failed to write to handler on connector " + this;
- ActiveMQServerLogger.LOGGER.errorWritingToInvmConnector(e, this);
+ ActiveMQServerLogger.LOGGER.errorWritingToInvmConnector(this, e);
throw new IllegalStateException(msg, e);
} finally {
buffer.release();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
index 699b29dcac..fcc9f77584 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
@@ -283,7 +283,7 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
managementService.registerAcceptor(acceptor, info);
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorCreatingAcceptor(e, info.getFactoryClassName());
+ ActiveMQServerLogger.LOGGER.errorCreatingAcceptor(info.getFactoryClassName(), e);
}
return acceptor;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
index cbf48116c0..39276edbf6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
@@ -241,11 +241,11 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
}
} catch (ActiveMQException e) {
logger.warn(e.getMessage(), e);
- ActiveMQServerLogger.LOGGER.errorHandlingReplicationPacket(e, packet);
+ ActiveMQServerLogger.LOGGER.errorHandlingReplicationPacket(packet, e);
response = new ActiveMQExceptionMessage(e);
} catch (Exception e) {
logger.warn(e.getMessage(), e);
- ActiveMQServerLogger.LOGGER.errorHandlingReplicationPacket(e, packet);
+ ActiveMQServerLogger.LOGGER.errorHandlingReplicationPacket(packet, e);
response = new ActiveMQExceptionMessage(ActiveMQMessageBundle.BUNDLE.replicationUnhandledError(e));
}
@@ -637,7 +637,7 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
}
message.deleteFile();
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorDeletingLargeMessage(e, packet.getMessageId());
+ ActiveMQServerLogger.LOGGER.errorDeletingLargeMessage(packet.getMessageId(), e);
}
}
});
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
index f5f75054a3..47c32cc542 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
@@ -131,7 +131,7 @@ public interface ActiveMQMessageBundle {
ActiveMQQueueExistsException queueAlreadyExists(SimpleString queueName, SimpleString addressName);
@Message(id = 229020, value = "Invalid filter: {}")
- ActiveMQInvalidFilterExpressionException invalidFilter(@Cause Throwable e, SimpleString filter);
+ ActiveMQInvalidFilterExpressionException invalidFilter(SimpleString filter, @Cause Throwable e);
@Message(id = 229021, value = "MessageId was not assigned to Message")
ActiveMQIllegalStateException messageIdNotAssigned();
@@ -287,7 +287,7 @@ public interface ActiveMQMessageBundle {
IllegalArgumentException nullPassword();
@Message(id = 229074, value = "Error instantiating transformer class {}")
- IllegalArgumentException errorCreatingTransformerClass(@Cause Exception e, String transformerClassName);
+ IllegalArgumentException errorCreatingTransformerClass(String transformerClassName, @Cause Exception e);
@Message(id = 229075, value = "method autoEncode doesn't know how to convert {} yet")
IllegalArgumentException autoConvertError(Class<? extends Object> aClass);
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 bc2ed282ac..23f9e2dcc0 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
@@ -148,10 +148,10 @@ public interface ActiveMQServerLogger {
void errorRemovingConnection();
@LogMessage(id = 221022, value = "unable to start connector service: {}", level = LogMessage.Level.INFO)
- void errorStartingConnectorService(@Cause Throwable e, String name);
+ void errorStartingConnectorService(String name, @Cause Throwable e);
@LogMessage(id = 221023, value = "unable to stop connector service: {}", level = LogMessage.Level.INFO)
- void errorStoppingConnectorService(@Cause Throwable e, String name);
+ void errorStoppingConnectorService(String name, @Cause Throwable e);
@LogMessage(id = 221024, value = "Backup server {} is synchronized with live server, nodeID={}.", level = LogMessage.Level.INFO)
void backupServerSynchronized(ActiveMQServerImpl server, String liveID);
@@ -405,13 +405,13 @@ public interface ActiveMQServerLogger {
void errorScanningURLs(@Cause Exception e);
@LogMessage(id = 222021, value = "problem undeploying {}", level = LogMessage.Level.WARN)
- void problemUndeployingNode(@Cause Exception e, Node node);
+ void problemUndeployingNode(Node node, @Cause Exception e);
@LogMessage(id = 222022, value = "Timed out waiting for paging cursor to stop {}", level = LogMessage.Level.WARN)
void timedOutStoppingPagingCursor(Executor executor);
@LogMessage(id = 222023, value = "problem cleaning page address {}", level = LogMessage.Level.WARN)
- void problemCleaningPageAddress(@Cause Exception e, SimpleString address);
+ void problemCleaningPageAddress(SimpleString address, @Cause Exception e);
@LogMessage(id = 222024, value = "Could not complete operations on IO context {}", level = LogMessage.Level.WARN)
void problemCompletingOperations(OperationContext e);
@@ -444,7 +444,7 @@ public interface ActiveMQServerLogger {
void pageSuspectFile(String fileName, int position, int msgNumber);
@LogMessage(id = 222034, value = "Can not delete page transaction id={}", level = LogMessage.Level.WARN)
- void pageTxDeleteError(@Cause Exception e, long recordID);
+ void pageTxDeleteError(long recordID, @Cause Exception e);
@LogMessage(id = 222035, value = "Directory {} did not have an identification file {}", level = LogMessage.Level.WARN)
void pageStoreFactoryNoIdFile(String s, String addressFile);
@@ -474,7 +474,7 @@ public interface ActiveMQServerLogger {
void journalCannotFindQueueForMessage(Long queueID);
@LogMessage(id = 222044, value = "It was not possible to delete message {}", level = LogMessage.Level.WARN)
- void journalErrorDeletingMessage(@Cause Exception e, Long messageID);
+ void journalErrorDeletingMessage(Long messageID, @Cause Exception e);
@LogMessage(id = 222045, value = "Message in prepared tx for queue {} which does not exist. This message will be ignored.", level = LogMessage.Level.WARN)
void journalMessageInPreparedTX(Long queueID);
@@ -501,7 +501,7 @@ public interface ActiveMQServerLogger {
void errorIncrementDelayDeletionCount(@Cause Exception e);
@LogMessage(id = 222053, value = "Error on copying large message {} for DLA or Expiry", level = LogMessage.Level.WARN)
- void lareMessageErrorCopying(@Cause Exception e, LargeServerMessage largeServerMessage);
+ void lareMessageErrorCopying(LargeServerMessage largeServerMessage, @Cause Exception e);
@LogMessage(id = 222054, value = "Error on executing IOCallback", level = LogMessage.Level.WARN)
void errorExecutingAIOCallback(@Cause Throwable t);
@@ -519,7 +519,7 @@ public interface ActiveMQServerLogger {
void duplicateMessageDetected(org.apache.activemq.artemis.api.core.Message message);
@LogMessage(id = 222060, value = "Error while confirming large message completion on rollback for recordID={}", level = LogMessage.Level.WARN)
- void journalErrorConfirmingLargeMessage(@Cause Throwable e, Long messageID);
+ void journalErrorConfirmingLargeMessage(Long messageID, @Cause Throwable e);
@LogMessage(id = 222061, value = "Client connection failed, clearing up resources for session {}", level = LogMessage.Level.WARN)
void clientConnectionFailed(String name);
@@ -564,13 +564,13 @@ public interface ActiveMQServerLogger {
void nettyChannelStillBound(Channel channel, SocketAddress remoteAddress);
@LogMessage(id = 222078, value = "Error instantiating remoting interceptor {}", level = LogMessage.Level.WARN)
- void errorCreatingRemotingInterceptor(@Cause Exception e, String interceptorClass);
+ void errorCreatingRemotingInterceptor(String interceptorClass, @Cause Exception e);
@LogMessage(id = 222079, value = "The following keys are invalid for configuring the acceptor: {} the acceptor will not be started.", level = LogMessage.Level.WARN)
void invalidAcceptorKeys(String s);
@LogMessage(id = 222080, value = "Error instantiating remoting acceptor {}", level = LogMessage.Level.WARN)
- void errorCreatingAcceptor(@Cause Exception e, String factoryClassName);
+ void errorCreatingAcceptor(String factoryClassName, @Cause Exception e);
@LogMessage(id = 222081, value = "Timed out waiting for remoting thread pool to terminate", level = LogMessage.Level.WARN)
void timeoutRemotingThreadPool();
@@ -588,7 +588,7 @@ public interface ActiveMQServerLogger {
void invalidPacketForReplication(Packet packet);
@LogMessage(id = 222086, value = "error handling packet {} for replication", level = LogMessage.Level.WARN)
- void errorHandlingReplicationPacket(@Cause Exception e, Packet packet);
+ void errorHandlingReplicationPacket(Packet packet, @Cause Exception e);
@LogMessage(id = 222087, value = "Replication Error while closing the page on backup", level = LogMessage.Level.WARN)
void errorClosingPageOnReplication(@Cause Exception e);
@@ -597,7 +597,7 @@ public interface ActiveMQServerLogger {
void journalcomparisonMismatch(String s);
@LogMessage(id = 222089, value = "Replication Error deleting large message ID = {}", level = LogMessage.Level.WARN)
- void errorDeletingLargeMessage(@Cause Exception e, long messageId);
+ void errorDeletingLargeMessage(long messageId, @Cause Exception e);
@LogMessage(id = 222090, value = "Replication Large MessageID {} is not available on backup server. Ignoring replication message", level = LogMessage.Level.WARN)
void largeMessageNotAvailable(long messageId);
@@ -612,13 +612,13 @@ public interface ActiveMQServerLogger {
void timedOutWaitingToStopBridge();
@LogMessage(id = 222094, value = "Bridge unable to send message {}, will try again once bridge reconnects", level = LogMessage.Level.WARN)
- void bridgeUnableToSendMessage(@Cause Exception e, MessageReference ref);
+ void bridgeUnableToSendMessage(MessageReference ref, @Cause Exception e);
@LogMessage(id = 222095, value = "Connection failed with failedOver={}", level = LogMessage.Level.WARN)
void bridgeConnectionFailed(Boolean failedOver);
@LogMessage(id = 222096, value = "Error on querying binding on bridge {}. Retrying in 100 milliseconds", level = LogMessage.Level.WARN)
- void errorQueryingBridge(@Cause Throwable t, String name);
+ void errorQueryingBridge(String name, @Cause Throwable t);
@LogMessage(id = 222097, value = "Address {} does not have any bindings, retry #({})", level = LogMessage.Level.WARN)
void errorQueryingBridge(String address, Integer retryCount);
@@ -627,7 +627,7 @@ public interface ActiveMQServerLogger {
void errorStartingBridge(String name);
@LogMessage(id = 222099, value = "Bridge {} is unable to connect to destination. It will be disabled.", level = LogMessage.Level.WARN)
- void errorConnectingBridge(@Cause Exception e, Bridge bridge);
+ void errorConnectingBridge(Bridge bridge, @Cause Exception e);
@LogMessage(id = 222100, value = "ServerLocator was shutdown, can not retry on opening connection for bridge", level = LogMessage.Level.WARN)
void bridgeLocatorShutdown();
@@ -660,28 +660,28 @@ public interface ActiveMQServerLogger {
void noQueueIdDefined(org.apache.activemq.artemis.api.core.Message message, org.apache.activemq.artemis.api.core.Message messageCopy, SimpleString idsHeaderName);
@LogMessage(id = 222111, value = "exception while invoking {} on {}", level = LogMessage.Level.TRACE)
- void managementOperationError(@Cause Exception e, String op, String resourceName);
+ void managementOperationError(String op, String resourceName, @Cause Exception e);
@LogMessage(id = 222112, value = "exception while retrieving attribute {} on {}", level = LogMessage.Level.WARN)
- void managementAttributeError(@Cause Exception e, String att, String resourceName);
+ void managementAttributeError(String att, String resourceName, @Cause Exception e);
@LogMessage(id = 222113, value = "On ManagementService stop, there are {} unexpected registered MBeans: {}", level = LogMessage.Level.WARN)
void managementStopError(Integer size, List<String> unexpectedResourceNames);
@LogMessage(id = 222114, value = "Unable to delete group binding info {}", level = LogMessage.Level.WARN)
- void unableToDeleteGroupBindings(@Cause Exception e, SimpleString groupId);
+ void unableToDeleteGroupBindings(SimpleString groupId, @Cause Exception e);
@LogMessage(id = 222115, value = "Error closing serverLocator={}", level = LogMessage.Level.WARN)
- void errorClosingServerLocator(@Cause Exception e, ServerLocatorInternal clusterLocator);
+ void errorClosingServerLocator(ServerLocatorInternal clusterLocator, @Cause Exception e);
@LogMessage(id = 222116, value = "unable to start broadcast group {}", level = LogMessage.Level.WARN)
- void unableToStartBroadcastGroup(@Cause Exception e, String name);
+ void unableToStartBroadcastGroup(String name, @Cause Exception e);
@LogMessage(id = 222117, value = "unable to start cluster connection {}", level = LogMessage.Level.WARN)
- void unableToStartClusterConnection(@Cause Exception e, SimpleString name);
+ void unableToStartClusterConnection(SimpleString name, @Cause Exception e);
@LogMessage(id = 222118, value = "unable to start Bridge {}", level = LogMessage.Level.WARN)
- void unableToStartBridge(@Cause Exception e, SimpleString name);
+ void unableToStartBridge(SimpleString name, @Cause Exception e);
@LogMessage(id = 222119, value = "No connector with name {}. backup cannot be announced.", level = LogMessage.Level.WARN)
void announceBackupNoConnector(String connectorName);
@@ -747,10 +747,10 @@ public interface ActiveMQServerLogger {
void remoteQueueAlreadyBoundOnClusterConnection(Object messageFlowRecord, SimpleString clusterName);
@LogMessage(id = 222141, value = "Node Manager can not open file {}", level = LogMessage.Level.WARN)
- void nodeManagerCantOpenFile(@Cause Exception e, File file);
+ void nodeManagerCantOpenFile(File file, @Cause Exception e);
@LogMessage(id = 222142, value = "Error on resetting large message deliver - {}", level = LogMessage.Level.WARN)
- void errorResttingLargeMessage(@Cause Throwable e, Object deliverer);
+ void errorResttingLargeMessage(Object deliverer, @Cause Throwable e);
@LogMessage(id = 222143, value = "Timed out waiting for executor to complete", level = LogMessage.Level.WARN)
void errorTransferringConsumer();
@@ -759,7 +759,7 @@ public interface ActiveMQServerLogger {
void errorFlushingExecutorsOnQueue();
@LogMessage(id = 222145, value = "Error expiring reference {} on queue", level = LogMessage.Level.WARN)
- void errorExpiringReferencesOnQueue(@Cause Exception e, MessageReference ref);
+ void errorExpiringReferencesOnQueue(MessageReference ref, @Cause Exception e);
@LogMessage(id = 222146, value = "Message has expired. No bindings for Expiry Address {} so dropping it", level = LogMessage.Level.WARN)
void errorExpiringReferencesNoBindings(SimpleString expiryAddress);
@@ -777,13 +777,13 @@ public interface ActiveMQServerLogger {
void messageExceededMaxDeliveryNoDLA(MessageReference ref, SimpleString name);
@LogMessage(id = 222151, value = "removing consumer which did not handle a message, consumer={}, message={}", level = LogMessage.Level.WARN)
- void removingBadConsumer(@Cause Throwable e, Consumer consumer, Object reference);
+ void removingBadConsumer(Consumer consumer, Object reference, @Cause Throwable e);
@LogMessage(id = 222152, value = "Unable to decrement reference counting on queue", level = LogMessage.Level.WARN)
void errorDecrementingRefCount(@Cause Throwable e);
@LogMessage(id = 222153, value = "Cannot locate record for message id = {} on Journal", level = LogMessage.Level.WARN)
- void cannotFindMessageOnJournal(@Cause Throwable e, Long messageID);
+ void cannotFindMessageOnJournal(Long messageID, @Cause Throwable e);
@LogMessage(id = 222154, value = "Error checking DLQ", level = LogMessage.Level.WARN)
void errorCheckingDLQ(@Cause Throwable e);
@@ -979,7 +979,7 @@ public interface ActiveMQServerLogger {
void fileDoesNotExist(String path);
@LogMessage(id = 222220, value = " Error while cleaning paging on queue {}", level = LogMessage.Level.WARN)
- void errorCleaningPagingOnQueue(@Cause Exception e, String queue);
+ void errorCleaningPagingOnQueue(String queue, @Cause Exception e);
@LogMessage(id = 222221, value = "Error while cleaning page, during the commit", level = LogMessage.Level.WARN)
void errorCleaningPagingDuringCommit(@Cause Exception e);
@@ -1174,10 +1174,10 @@ public interface ActiveMQServerLogger {
void emptyAddressFile(String addressFile, String directory);
@LogMessage(id = 222286, value = "Error executing {} federation plugin method.", level = LogMessage.Level.WARN)
- void federationPluginExecutionError(@Cause Throwable e, String pluginMethod);
+ void federationPluginExecutionError(String pluginMethod, @Cause Throwable e);
@LogMessage(id = 222287, value = "Error looking up bindings for address {}.", level = LogMessage.Level.WARN)
- void federationBindingsLookupError(@Cause Throwable e, SimpleString address);
+ void federationBindingsLookupError(SimpleString address, @Cause Throwable e);
@LogMessage(id = 222288, value = "Page {}, message {} could not be found on offset {}, with starting message {}. This represents a logic error or inconsistency on the data, and the system will try once again from the beggining of the page file.", level = LogMessage.Level.WARN)
void pageLookupError(long pageNr, int messageNr, int offset, int startNr);
@@ -1210,7 +1210,7 @@ public interface ActiveMQServerLogger {
void unableStartManagementContext(@Cause Exception e);
@LogMessage(id = 222298, value = "Failed to create bootstrap user \"{}\". User management may not function.", level = LogMessage.Level.WARN)
- void failedToCreateBootstrapCredentials(@Cause Exception e, String user);
+ void failedToCreateBootstrapCredentials(String user, @Cause Exception e);
@LogMessage(id = 222299, value = "No bootstrap credentials found. User management may not function.", level = LogMessage.Level.WARN)
void noBootstrapCredentialsFound();
@@ -1225,16 +1225,16 @@ public interface ActiveMQServerLogger {
void failedToDealWithObjectProperty(SimpleString property, String exceptionMessage);
@LogMessage(id = 222303, value = "Redistribution by {} of messageID = {} failed", level = LogMessage.Level.WARN)
- void errorRedistributing(@Cause Throwable t, String queueName, long m);
+ void errorRedistributing(String queueName, long m, @Cause Throwable t);
@LogMessage(id = 222304, value = "Unable to load message from journal", level = LogMessage.Level.WARN)
void unableToLoadMessageFromJournal(@Cause Throwable t);
@LogMessage(id = 222305, value = "Error federating message {}.", level = LogMessage.Level.WARN)
- void federationDispatchError(@Cause Throwable e, String message);
+ void federationDispatchError(String message, @Cause Throwable e);
@LogMessage(id = 222306, value = "Failed to load prepared TX and it will be rolled back: {}", level = LogMessage.Level.WARN)
- void failedToLoadPreparedTX(@Cause Throwable e, String message);
+ void failedToLoadPreparedTX(String message, @Cause Throwable e);
@LogMessage(id = 222307, value = "The queues element is deprecated and replaced by the addresses element", level = LogMessage.Level.WARN)
void queuesElementDeprecated();
@@ -1248,16 +1248,16 @@ public interface ActiveMQServerLogger {
void initializationError(@Cause Throwable e);
@LogMessage(id = 224001, value = "Error deploying URI {}", level = LogMessage.Level.ERROR)
- void errorDeployingURI(@Cause Throwable e, URI uri);
+ void errorDeployingURI(URI uri, @Cause Throwable e);
@LogMessage(id = 224002, value = "Error deploying URI", level = LogMessage.Level.ERROR)
void errorDeployingURI(@Cause Throwable e);
@LogMessage(id = 224003, value = "Error undeploying URI {}", level = LogMessage.Level.ERROR)
- void errorUnDeployingURI(@Cause Throwable e, URI a);
+ void errorUnDeployingURI(URI a, @Cause Throwable e);
@LogMessage(id = 224005, value = "Unable to deploy node {}", level = LogMessage.Level.ERROR)
- void unableToDeployNode(@Cause Exception e, Node node);
+ void unableToDeployNode(Node node, @Cause Exception e);
@LogMessage(id = 224006, value = "Invalid filter: {}", level = LogMessage.Level.ERROR)
void invalidFilter(SimpleString filter);
@@ -1311,7 +1311,7 @@ public interface ActiveMQServerLogger {
void stompErrorTXExists(String txID);
@LogMessage(id = 224027, value = "Failed to write to handler on invm connector {}", level = LogMessage.Level.ERROR)
- void errorWritingToInvmConnector(@Cause Exception e, Runnable runnable);
+ void errorWritingToInvmConnector(Runnable runnable, @Cause Exception e);
@LogMessage(id = 224028, value = "Failed to stop acceptor {}", level = LogMessage.Level.ERROR)
void errorStoppingAcceptor(String name);
@@ -1320,7 +1320,7 @@ public interface ActiveMQServerLogger {
void largeMessageIncompatible();
@LogMessage(id = 224030, value = "Could not cancel reference {}", level = LogMessage.Level.ERROR)
- void errorCancellingRefOnBridge(@Cause Exception e, MessageReference ref2);
+ void errorCancellingRefOnBridge(MessageReference ref2, @Cause Exception e);
@LogMessage(id = 224032, value = "Failed to pause bridge", level = LogMessage.Level.ERROR)
void errorPausingBridge(@Cause Exception e);
@@ -1353,7 +1353,7 @@ public interface ActiveMQServerLogger {
void errorDelivering(@Cause Exception e);
@LogMessage(id = 224042, value = "Error while restarting the backup server: {}", level = LogMessage.Level.ERROR)
- void errorRestartingBackupServer(@Cause Exception e, ActiveMQServer backup);
+ void errorRestartingBackupServer(ActiveMQServer backup, @Cause Exception e);
@LogMessage(id = 224043, value = "Failed to send forced delivery message", level = LogMessage.Level.ERROR)
void errorSendingForcedDelivery(@Cause Exception e);
@@ -1365,13 +1365,13 @@ public interface ActiveMQServerLogger {
void errorRunningLargeMessageDeliverer(@Cause Exception e);
@LogMessage(id = 224046, value = "Exception while browser handled from {}", level = LogMessage.Level.ERROR)
- void errorBrowserHandlingMessage(@Cause Exception e, MessageReference current);
+ void errorBrowserHandlingMessage(MessageReference current, @Cause Exception e);
@LogMessage(id = 224047, value = "Failed to delete large message file", level = LogMessage.Level.ERROR)
void errorDeletingLargeMessageFile(@Cause Throwable e);
@LogMessage(id = 224048, value = "Failed to remove temporary queue {}", level = LogMessage.Level.ERROR)
- void errorRemovingTempQueue(@Cause Exception e, SimpleString bindingName);
+ void errorRemovingTempQueue(SimpleString bindingName, @Cause Exception e);
@LogMessage(id = 224049, value = "Cannot find consumer with id {}", level = LogMessage.Level.ERROR)
void cannotFindConsumer(long consumerID);
@@ -1386,7 +1386,7 @@ public interface ActiveMQServerLogger {
void errorCallingRepoListener(@Cause Throwable e);
@LogMessage(id = 224053, value = "failed to timeout transaction, xid:{}", level = LogMessage.Level.ERROR)
- void errorTimingOutTX(@Cause Exception e, Xid xid);
+ void errorTimingOutTX(Xid xid, @Cause Exception e);
@LogMessage(id = 224054, value = "exception while stopping the replication manager", level = LogMessage.Level.ERROR)
void errorStoppingReplicationManager(@Cause Throwable t);
@@ -1424,7 +1424,7 @@ public interface ActiveMQServerLogger {
void incompatibleWithHAPolicyChosen(String parameter);
@LogMessage(id = 224065, value = "Failed to remove auto-created {} {}", level = LogMessage.Level.ERROR)
- void errorRemovingAutoCreatedDestination(@Cause Exception e, String destinationType, SimpleString bindingName);
+ void errorRemovingAutoCreatedDestination(String destinationType, SimpleString bindingName, @Cause Exception e);
@LogMessage(id = 224066, value = "Error opening context for LDAP", level = LogMessage.Level.ERROR)
void errorOpeningContextForLDAP(@Cause Exception e);
@@ -1433,7 +1433,7 @@ public interface ActiveMQServerLogger {
void errorPopulatingSecurityRolesFromLDAP(@Cause Exception e);
@LogMessage(id = 224068, value = "Unable to stop component: {}", level = LogMessage.Level.ERROR)
- void errorStoppingComponent(@Cause Throwable t, String componentClassName);
+ void errorStoppingComponent(String componentClassName, @Cause Throwable t);
@LogMessage(id = 224069, value = "Change detected in broker configuration file, but reload failed", level = LogMessage.Level.ERROR)
void configurationReloadFailed(@Cause Throwable t);
@@ -1445,7 +1445,7 @@ public interface ActiveMQServerLogger {
void journalUseMAPPED();
@LogMessage(id = 224074, value = "Failed to purge queue {} on no consumers", level = LogMessage.Level.ERROR)
- void failedToPurgeQueue(@Cause Exception e, SimpleString bindingName);
+ void failedToPurgeQueue(SimpleString bindingName, @Cause Exception e);
@LogMessage(id = 224075, value = "Cannot find pageTX id = {}", level = LogMessage.Level.ERROR)
void journalCannotFindPageTX(Long id);
@@ -1478,7 +1478,7 @@ public interface ActiveMQServerLogger {
void failedToOpenContext(@Cause Exception e);
@LogMessage(id = 224085, value = "Failed to load property {}, reason: {}", level = LogMessage.Level.ERROR)
- void failedToLoadProperty(@Cause Exception e, String key, String reason);
+ void failedToLoadProperty(String key, String reason, @Cause Exception e);
@LogMessage(id = 224086, value = "Caught unexpected exception", level = LogMessage.Level.ERROR)
void caughtUnexpectedException(@Cause NamingException e);
@@ -1541,7 +1541,7 @@ public interface ActiveMQServerLogger {
void failedConnectingToCluster(@Cause Exception e);
@LogMessage(id = 224106, value = "failed to remove transaction, xid:{}", level = LogMessage.Level.ERROR)
- void errorRemovingTX(@Cause Exception e, Xid xid);
+ void errorRemovingTX(Xid xid, @Cause Exception e);
@LogMessage(id = 224107, value = "The Critical Analyzer detected slow paths on the broker. It is recommended that you enable trace logs on org.apache.activemq.artemis.utils.critical while you troubleshoot this issue. You should disable the trace logs when you have finished troubleshooting.", level = LogMessage.Level.INFO)
void enableTraceForCriticalAnalyzer();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java
index 319bbd7546..debe5be9bf 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java
@@ -264,7 +264,7 @@ public class ClusterManager implements ActiveMQComponent {
try {
group.start();
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.unableToStartBroadcastGroup(e, group.getName());
+ ActiveMQServerLogger.LOGGER.unableToStartBroadcastGroup(group.getName(), e);
}
}
@@ -272,7 +272,7 @@ public class ClusterManager implements ActiveMQComponent {
try {
conn.start();
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.unableToStartClusterConnection(e, conn.getName());
+ ActiveMQServerLogger.LOGGER.unableToStartClusterConnection(conn.getName(), e);
}
}
@@ -282,7 +282,7 @@ public class ClusterManager implements ActiveMQComponent {
try {
bridge.start();
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.unableToStartBridge(e, bridge.getName());
+ ActiveMQServerLogger.LOGGER.unableToStartBridge(bridge.getName(), e);
}
}
@@ -333,7 +333,7 @@ public class ClusterManager implements ActiveMQComponent {
try {
clusterLocator.close();
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorClosingServerLocator(e, clusterLocator);
+ ActiveMQServerLogger.LOGGER.errorClosingServerLocator(clusterLocator, e);
}
}
clusterLocators.clear();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index 23377b7aa3..bb13fc7982 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -304,7 +304,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
refqueue.cancel(ref, timeBase);
} catch (Exception e) {
// There isn't much we can do besides log an error
- ActiveMQServerLogger.LOGGER.errorCancellingRefOnBridge(e, ref);
+ ActiveMQServerLogger.LOGGER.errorCancellingRefOnBridge(ref, e);
}
}
}
@@ -730,7 +730,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
} catch (final ActiveMQException e) {
unsetLargeMessageDelivery();
- ActiveMQServerLogger.LOGGER.bridgeUnableToSendMessage(e, ref);
+ ActiveMQServerLogger.LOGGER.bridgeUnableToSendMessage(ref, e);
connectionFailed(e, false);
}
@@ -756,7 +756,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
try {
producer.send(dest, message);
} catch (final ActiveMQException e) {
- ActiveMQServerLogger.LOGGER.bridgeUnableToSendMessage(e, ref);
+ ActiveMQServerLogger.LOGGER.bridgeUnableToSendMessage(ref, e);
synchronized (refs) {
// We remove this reference as we are returning busy which means the reference will never leave the Queue.
@@ -946,7 +946,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
try {
query = session.addressQuery(SimpleString.toSimpleString(configuration.getForwardingAddress()));
} catch (Throwable e) {
- ActiveMQServerLogger.LOGGER.errorQueryingBridge(e, configuration.getName());
+ ActiveMQServerLogger.LOGGER.errorQueryingBridge(configuration.getName(), e);
// This was an issue during startup, we will not count this retry
retryCount--;
@@ -1001,9 +1001,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
scheduleRetryConnect();
}
} catch (ActiveMQInterruptedException | InterruptedException e) {
- ActiveMQServerLogger.LOGGER.errorConnectingBridge(e, this);
+ ActiveMQServerLogger.LOGGER.errorConnectingBridge(this, e);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorConnectingBridge(e, this);
+ ActiveMQServerLogger.LOGGER.errorConnectingBridge(this, e);
if (csf != null) {
try {
csf.close();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/AbstractFederationStream.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/AbstractFederationStream.java
index 23e9040158..0066c14a0c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/AbstractFederationStream.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/AbstractFederationStream.java
@@ -123,7 +123,7 @@ public abstract class AbstractFederationStream implements FederationStream {
try {
server.callBrokerFederationPlugins(plugin -> plugin.federationStreamStarted(this));
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "federationStreamStarted");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("federationStreamStarted", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
}
@@ -134,7 +134,7 @@ public abstract class AbstractFederationStream implements FederationStream {
try {
server.callBrokerFederationPlugins(plugin -> plugin.federationStreamStopped(this));
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "federationStreamStopped");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("federationStreamStopped", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedAbstract.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedAbstract.java
index 9bff8801eb..6023a002df 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedAbstract.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedAbstract.java
@@ -115,7 +115,7 @@ public abstract class FederatedAbstract implements ActiveMQServerBasePlugin {
try {
server.callBrokerFederationPlugins(plugin -> plugin.beforeCreateFederatedQueueConsumer(key));
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "beforeCreateFederatedQueueConsumer");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("beforeCreateFederatedQueueConsumer", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
}
@@ -128,7 +128,7 @@ public abstract class FederatedAbstract implements ActiveMQServerBasePlugin {
final FederatedQueueConsumer finalConsumer = remoteQueueConsumer;
server.callBrokerFederationPlugins(plugin -> plugin.afterCreateFederatedQueueConsumer(finalConsumer));
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "afterCreateFederatedQueueConsumer");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("afterCreateFederatedQueueConsumer", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
}
@@ -145,7 +145,7 @@ public abstract class FederatedAbstract implements ActiveMQServerBasePlugin {
try {
server.callBrokerFederationPlugins(plugin -> plugin.beforeCloseFederatedQueueConsumer(remoteQueueConsumer));
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "beforeCloseFederatedQueueConsumer");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("beforeCloseFederatedQueueConsumer", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
}
@@ -157,7 +157,7 @@ public abstract class FederatedAbstract implements ActiveMQServerBasePlugin {
try {
server.callBrokerFederationPlugins(plugin -> plugin.afterCloseFederatedQueueConsumer(remoteQueueConsumer));
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "afterCloseFederatedQueueConsumer");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("afterCloseFederatedQueueConsumer", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedQueueConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedQueueConsumerImpl.java
index aefa889c33..115215f7d5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedQueueConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedQueueConsumerImpl.java
@@ -202,7 +202,7 @@ public class FederatedQueueConsumerImpl implements FederatedQueueConsumer, Sessi
try {
server.callBrokerFederationPlugins(plugin -> plugin.beforeFederatedQueueConsumerMessageHandled(this, clientMessage));
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "beforeFederatedQueueConsumerMessageHandled");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("beforeFederatedQueueConsumerMessageHandled", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
}
@@ -217,12 +217,12 @@ public class FederatedQueueConsumerImpl implements FederatedQueueConsumer, Sessi
try {
server.callBrokerFederationPlugins(plugin -> plugin.afterFederatedQueueConsumerMessageHandled(this, clientMessage));
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "afterFederatedQueueConsumerMessageHandled");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("afterFederatedQueueConsumerMessageHandled", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.federationDispatchError(e, clientMessage.toString());
+ ActiveMQServerLogger.LOGGER.federationDispatchError(clientMessage.toString(), e);
try {
clientSession.rollback();
} catch (ActiveMQException e1) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/address/FederatedAddress.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/address/FederatedAddress.java
index a7218edb9e..2d75acb9ed 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/address/FederatedAddress.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/address/FederatedAddress.java
@@ -124,7 +124,7 @@ public class FederatedAddress extends FederatedAbstract implements ActiveMQServe
conditionalCreate.set(conditionalCreate.get() && plugin.federatedAddressConditionalCreateConsumer(queue));
});
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "federatedAddressConditionalCreateConsumer");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("federatedAddressConditionalCreateConsumer", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
if (!conditionalCreate.get()) {
@@ -145,7 +145,7 @@ public class FederatedAddress extends FederatedAbstract implements ActiveMQServe
.stream().filter(binding -> binding instanceof DivertBinding)
.forEach(this::afterAddBinding);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.federationBindingsLookupError(e, addressInfo.getName());
+ ActiveMQServerLogger.LOGGER.federationBindingsLookupError(addressInfo.getName(), e);
}
}
}
@@ -184,7 +184,7 @@ public class FederatedAddress extends FederatedAbstract implements ActiveMQServe
.stream().filter(b -> b instanceof QueueBinding).map(b -> (QueueBinding) b)
.forEach(queueBinding -> conditionalCreateRemoteConsumer(divertBinding, matchingQueues, queueBinding));
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.federationBindingsLookupError(e, forwardAddress);
+ ActiveMQServerLogger.LOGGER.federationBindingsLookupError(forwardAddress, e);
}
}
}
@@ -199,7 +199,7 @@ public class FederatedAddress extends FederatedAbstract implements ActiveMQServe
conditionalCreate.set(conditionalCreate.get() && plugin.federatedAddressConditionalCreateDivertConsumer(divertBinding, queueBinding));
});
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "federatedAddressConditionalCreateDivertConsumer");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("federatedAddressConditionalCreateDivertConsumer", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
if (!conditionalCreate.get()) {
@@ -266,7 +266,7 @@ public class FederatedAddress extends FederatedAbstract implements ActiveMQServe
.forEach(queueBinding -> removeRemoteConsumer(getKey(addressInfo)));
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.federationBindingsLookupError(e, forwardAddress);
+ ActiveMQServerLogger.LOGGER.federationBindingsLookupError(forwardAddress, e);
}
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java
index 22e03a3bb4..3bc58f4bee 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java
@@ -122,7 +122,7 @@ public class FederatedQueue extends FederatedAbstract implements ActiveMQServerC
conditionalCreate.set(conditionalCreate.get() && plugin.federatedQueueConditionalCreateConsumer(consumer));
});
} catch (ActiveMQException t) {
- ActiveMQServerLogger.LOGGER.federationPluginExecutionError(t, "federatedQueueConditionalCreateConsumer");
+ ActiveMQServerLogger.LOGGER.federationPluginExecutionError("federatedQueueConditionalCreateConsumer", t);
throw new IllegalStateException(t.getMessage(), t.getCause());
}
if (!conditionalCreate.get()) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
index 211347ad84..d64105133e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
@@ -372,7 +372,7 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract {
}
storageManager.deleteGrouping(txID, val);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(e, val.getGroupId());
+ ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(val.getGroupId(), e);
}
}
}
@@ -381,7 +381,7 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract {
try {
storageManager.commitBindings(txID);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(e, SimpleString.toSimpleString("TX:" + txID));
+ ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(SimpleString.toSimpleString("TX:" + txID), e);
}
}
}
@@ -436,7 +436,7 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract {
txID = -1;
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(e, groupBinding.getGroupId());
+ ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(groupBinding.getGroupId(), e);
}
}
}
@@ -445,7 +445,7 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract {
try {
storageManager.commitBindings(txID);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(e, SimpleString.toSimpleString("TX:" + txID));
+ ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(SimpleString.toSimpleString("TX:" + txID), 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 a1a2450fc8..e4e3eb1be5 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
@@ -1303,7 +1303,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
try {
activation.preStorageClose();
} catch (Throwable t) {
- ActiveMQServerLogger.LOGGER.errorStoppingComponent(t, activation.getClass().getName());
+ ActiveMQServerLogger.LOGGER.errorStoppingComponent(activation.getClass().getName(), t);
}
}
@@ -1313,7 +1313,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
try {
storageManager.stop(criticalIOError, failoverOnServerShutdown);
} catch (Throwable t) {
- ActiveMQServerLogger.LOGGER.errorStoppingComponent(t, storageManager.getClass().getName());
+ ActiveMQServerLogger.LOGGER.errorStoppingComponent(storageManager.getClass().getName(), t);
}
// We stop remotingService before otherwise we may lock the system in case of a critical IO
@@ -1323,7 +1323,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
try {
remotingService.stop(criticalIOError);
} catch (Throwable t) {
- ActiveMQServerLogger.LOGGER.errorStoppingComponent(t, remotingService.getClass().getName());
+ ActiveMQServerLogger.LOGGER.errorStoppingComponent(remotingService.getClass().getName(), t);
}
// Stop the management service after the remoting service to ensure all acceptors are deregistered with JMX
@@ -1332,7 +1332,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
try {
managementService.unregisterServer();
} catch (Throwable t) {
- ActiveMQServerLogger.LOGGER.errorStoppingComponent(t, managementService.getClass().getName());
+ ActiveMQServerLogger.LOGGER.errorStoppingComponent(managementService.getClass().getName(), t);
}
stopComponent(managementService);
@@ -1361,7 +1361,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
try {
securityStore.stop();
} catch (Throwable t) {
- ActiveMQServerLogger.LOGGER.errorStoppingComponent(t, securityStore.getClass().getName());
+ ActiveMQServerLogger.LOGGER.errorStoppingComponent(securityStore.getClass().getName(), t);
}
}
@@ -1390,7 +1390,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
try {
activation.close(failoverOnServerShutdown, restarting);
} catch (Throwable t) {
- ActiveMQServerLogger.LOGGER.errorStoppingComponent(t, activation.getClass().getName());
+ ActiveMQServerLogger.LOGGER.errorStoppingComponent(activation.getClass().getName(), t);
}
}
@@ -1529,7 +1529,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
component.stop();
}
} catch (Throwable t) {
- ActiveMQServerLogger.LOGGER.errorStoppingComponent(t, component.getClass().getName());
+ ActiveMQServerLogger.LOGGER.errorStoppingComponent(component.getClass().getName(), t);
}
}
@@ -4453,7 +4453,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
externalComponent.stop();
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorStoppingComponent(e, externalComponent.getClass().getName());
+ ActiveMQServerLogger.LOGGER.errorStoppingComponent(externalComponent.getClass().getName(), e);
}
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java
index 897d27cdce..c9fb20060a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java
@@ -79,7 +79,7 @@ public final class ConnectorsService implements ActiveMQComponent {
try {
createService(pair.getB(), pair.getA());
} catch (Throwable e) {
- ActiveMQServerLogger.LOGGER.errorStartingConnectorService(e, pair.getB().getConnectorName());
+ ActiveMQServerLogger.LOGGER.errorStartingConnectorService(pair.getB().getConnectorName(), e);
}
}
@@ -126,7 +126,7 @@ public final class ConnectorsService implements ActiveMQComponent {
try {
connector.getValue().stop();
} catch (Throwable e) {
- ActiveMQServerLogger.LOGGER.errorStoppingConnectorService(e, connector.getKey());
+ ActiveMQServerLogger.LOGGER.errorStoppingConnectorService(connector.getKey(), e);
}
}
connectors.clear();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileBasedNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileBasedNodeManager.java
index ec2eefebd6..d33f9b4f09 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileBasedNodeManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileBasedNodeManager.java
@@ -146,7 +146,7 @@ public abstract class FileBasedNodeManager extends NodeManager {
try {
fileCreated = serverLockFile.createNewFile();
} catch (RuntimeException e) {
- ActiveMQServerLogger.LOGGER.nodeManagerCantOpenFile(e, serverLockFile);
+ ActiveMQServerLogger.LOGGER.nodeManagerCantOpenFile(serverLockFile, e);
throw e;
} catch (IOException e) {
/*
@@ -160,7 +160,7 @@ public abstract class FileBasedNodeManager extends NodeManager {
count++;
continue;
}
- ActiveMQServerLogger.LOGGER.nodeManagerCantOpenFile(e, serverLockFile);
+ ActiveMQServerLogger.LOGGER.nodeManagerCantOpenFile(serverLockFile, e);
throw e;
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index e884e1525b..0ca2af03f5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -258,7 +258,7 @@ public class PostOfficeJournalLoader implements JournalLoader {
try {
storageManager.deleteMessage(msg.getMessageID());
} catch (Exception ignored) {
- ActiveMQServerLogger.LOGGER.journalErrorDeletingMessage(ignored, msg.getMessageID());
+ ActiveMQServerLogger.LOGGER.journalErrorDeletingMessage(msg.getMessageID(), ignored);
}
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 1362c33fa2..c121f607a3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -2488,7 +2488,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
expire(tx, ref, true);
refRemoved(ref);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorExpiringReferencesOnQueue(e, ref);
+ ActiveMQServerLogger.LOGGER.errorExpiringReferencesOnQueue(ref, e);
}
}
@@ -3854,7 +3854,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
private void internalErrorProcessing(Consumer consumer, Throwable t, MessageReference reference) {
synchronized (this) {
- ActiveMQServerLogger.LOGGER.removingBadConsumer(t, consumer, reference);
+ ActiveMQServerLogger.LOGGER.removingBadConsumer(consumer, reference, t);
// If the consumer throws an exception we remove the consumer
try {
removeConsumer(consumer);
@@ -3896,7 +3896,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
try {
status = consumer.handle(reference);
} catch (Throwable t) {
- ActiveMQServerLogger.LOGGER.removingBadConsumer(t, consumer, reference);
+ ActiveMQServerLogger.LOGGER.removingBadConsumer(consumer, reference, t);
// If the consumer throws an exception we remove the consumer
try {
@@ -3988,7 +3988,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
try {
storageManager.deleteMessage(message.getMessageID());
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.cannotFindMessageOnJournal(e, message.getMessageID());
+ ActiveMQServerLogger.LOGGER.cannotFindMessageOnJournal(message.getMessageID(), e);
}
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueManagerImpl.java
index 93e204621e..89dfc3490b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueManagerImpl.java
@@ -59,7 +59,7 @@ public class QueueManagerImpl extends ReferenceCounterUtil implements QueueManag
try {
queue.deleteMatchingReferences(QueueImpl.DEFAULT_FLUSH_LIMIT, null, AckReason.KILLED);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.failedToPurgeQueue(e, queue.getName());
+ ActiveMQServerLogger.LOGGER.failedToPurgeQueue(queue.getName(), e);
}
}
@@ -75,7 +75,7 @@ public class QueueManagerImpl extends ReferenceCounterUtil implements QueueManag
try {
server.destroyQueue(queueName, null, true, false, false, true);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorRemovingAutoCreatedDestination(e, "queue", queueName);
+ ActiveMQServerLogger.LOGGER.errorRemovingAutoCreatedDestination("queue", queueName, e);
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationBackupActivation.java
index e8d064ecfa..c31c5d3866 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationBackupActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationBackupActivation.java
@@ -483,7 +483,7 @@ public final class ReplicationBackupActivation extends Activation implements Dis
}
} catch (Exception e) {
if (restart) {
- ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(e, server);
+ ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(server, e);
} else {
ActiveMQServerLogger.LOGGER.errorStoppingServer(e);
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationPrimaryActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationPrimaryActivation.java
index 895c2a17e1..e1a09f6e95 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationPrimaryActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationPrimaryActivation.java
@@ -342,7 +342,7 @@ public class ReplicationPrimaryActivation extends LiveActivation implements Dist
try {
activeMQServer.stop();
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(e, activeMQServer);
+ ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(activeMQServer, e);
}
}).start();
}
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 8277948d2a..53cf40d80d 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
@@ -700,7 +700,7 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
pendingLargeMessageDeliverer.finish();
}
} catch (Throwable e) {
- ActiveMQServerLogger.LOGGER.errorResttingLargeMessage(e, largeMessageDeliverer);
+ ActiveMQServerLogger.LOGGER.errorResttingLargeMessage(largeMessageDeliverer, e);
} finally {
largeMessageDeliverer = null;
}
@@ -1454,7 +1454,7 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
current = null;
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorBrowserHandlingMessage(e, current);
+ ActiveMQServerLogger.LOGGER.errorBrowserHandlingMessage(current, e);
return;
}
}
@@ -1488,7 +1488,7 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
break;
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorBrowserHandlingMessage(e, ref);
+ ActiveMQServerLogger.LOGGER.errorBrowserHandlingMessage(ref, e);
break;
}
}
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 6a4d6d1dfd..a79edc339b 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
@@ -1139,7 +1139,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
logger.debug(e.getMessage(), e);
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorRemovingTempQueue(e, bindingName);
+ ActiveMQServerLogger.LOGGER.errorRemovingTempQueue(bindingName, e);
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
index 1597e08061..f1325fc950 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
@@ -253,7 +253,7 @@ public class ServiceRegistryImpl implements ServiceRegistry {
transformer = new RegisteredTransformer(loadClass(transformerConfiguration.getClassName()));
transformer.init(Collections.unmodifiableMap(transformerConfiguration.getProperties()));
} catch (Exception e) {
- throw ActiveMQMessageBundle.BUNDLE.errorCreatingTransformerClass(e, transformerConfiguration.getClassName());
+ throw ActiveMQMessageBundle.BUNDLE.errorCreatingTransformerClass(transformerConfiguration.getClassName(), e);
}
}
return transformer;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
index cb008da862..0584dbae1c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
@@ -274,7 +274,7 @@ public final class SharedNothingBackupActivation extends Activation implements R
}
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(e, activeMQServer);
+ ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(activeMQServer, e);
}
}
});
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
index 24ed76f354..90145e9dd1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
@@ -276,7 +276,7 @@ public class SharedNothingLiveActivation extends LiveActivation {
}
activeMQServer.stop();
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(e, activeMQServer);
+ ActiveMQServerLogger.LOGGER.errorRestartingBackupServer(activeMQServer, e);
}
}
});
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/TransientQueueManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/TransientQueueManagerImpl.java
index b982145b62..f03660cde8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/TransientQueueManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/TransientQueueManagerImpl.java
@@ -48,7 +48,7 @@ public class TransientQueueManagerImpl extends ReferenceCounterUtil implements T
ActiveMQServerLogger.LOGGER.errorOnDeletingQueue(queueName.toString(), e);
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorRemovingTempQueue(e, queueName);
+ ActiveMQServerLogger.LOGGER.errorRemovingTempQueue(queueName, e);
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
index f3e36a5182..3c7cda555e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
@@ -554,7 +554,7 @@ public class ManagementServiceImpl implements ManagementService {
reply.putBooleanProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED, true);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.managementOperationError(e, operation, resourceName);
+ ActiveMQServerLogger.LOGGER.managementOperationError(operation, resourceName, e);
reply.putBooleanProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED, false);
String exceptionMessage;
if (e instanceof InvocationTargetException) {
@@ -575,7 +575,7 @@ public class ManagementServiceImpl implements ManagementService {
reply.putBooleanProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED, true);
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.managementAttributeError(e, attribute, resourceName);
+ ActiveMQServerLogger.LOGGER.managementAttributeError(attribute, resourceName, e);
reply.putBooleanProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED, false);
String exceptionMessage;
if (e instanceof InvocationTargetException) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/ResourceManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/ResourceManagerImpl.java
index bba335adaa..3ba9a189a7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/ResourceManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/ResourceManagerImpl.java
@@ -240,7 +240,7 @@ public class ResourceManagerImpl implements ResourceManager {
try {
removedTX = removeTransaction(tx.getXid(), null);
} catch (ActiveMQException e) {
- ActiveMQServerLogger.LOGGER.errorRemovingTX(e, tx.getXid());
+ ActiveMQServerLogger.LOGGER.errorRemovingTX(tx.getXid(), e);
}
if (removedTX != null) {
ActiveMQServerLogger.LOGGER.timedOutXID(removedTX.getXid());
@@ -253,7 +253,7 @@ public class ResourceManagerImpl implements ResourceManager {
try {
failedTransaction.rollback();
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.errorTimingOutTX(e, failedTransaction.getXid());
+ ActiveMQServerLogger.LOGGER.errorTimingOutTX(failedTransaction.getXid(), e);
}
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQBasicSecurityManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQBasicSecurityManager.java
index 47b1ed0e9e..a5b71bfb60 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQBasicSecurityManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQBasicSecurityManager.java
@@ -205,7 +205,7 @@ public class ActiveMQBasicSecurityManager implements ActiveMQSecurityManager5, U
addNewUser(user, password, roles);
}
} catch (Exception e) {
- ActiveMQServerLogger.LOGGER.failedToCreateBootstrapCredentials(e, user);
+ ActiveMQServerLogger.LOGGER.failedToCreateBootstrapCredentials(user, e);
}
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/ReloadableProperties.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/ReloadableProperties.java
index 220ca26fb4..a861eabddb 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/ReloadableProperties.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/ReloadableProperties.java
@@ -67,7 +67,7 @@ public class ReloadableProperties {
logger.debug("Load of: " + key);
}
} catch (IOException e) {
- ActiveMQServerLogger.LOGGER.failedToLoadProperty(e, key.toString(), e.getLocalizedMessage());
+ ActiveMQServerLogger.LOGGER.failedToLoadProperty(key.toString(), e.getLocalizedMessage(), e);
if (key.isDebug()) {
logger.debug("Load of: " + key + ", failure exception" + e);
}
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
index a2349c7d01..e9c7d87c27 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
@@ -49,7 +49,7 @@ public interface ActiveMQXARecoveryLogger {
void recoveryConnectFailed(String s);
@LogMessage(id = 172011, value = "error unbinding {} from JNDI", level = LogMessage.Level.WARN)
- void jndiUnbindError(@Cause Exception e, String key);
+ void jndiUnbindError(String key, @Cause Exception e);
@LogMessage(id = 172012, value = "JMS Server Manager error", level = LogMessage.Level.WARN)
void jmsServerError(@Cause Exception e);
@@ -59,18 +59,18 @@ public interface ActiveMQXARecoveryLogger {
@LogMessage(id = 172014, value = "Notified of connection failure in xa recovery connectionFactory for provider {} will attempt reconnect on next pass",
level = LogMessage.Level.WARN)
- void xaRecoverConnectionError(@Cause Exception e, ClientSessionFactory csf);
+ void xaRecoverConnectionError(ClientSessionFactory csf, @Cause Exception e);
@LogMessage(id = 172015, value = "Can not connect to {} on auto-generated resource recovery",
level = LogMessage.Level.WARN)
- void xaRecoverAutoConnectionError(@Cause Throwable e, XARecoveryConfig csf);
+ void xaRecoverAutoConnectionError(XARecoveryConfig csf, @Cause Throwable e);
@LogMessage(id = 172016, value = "Error in XA Recovery", level = LogMessage.Level.DEBUG)
void xaRecoveryError(@Cause Exception e);
@LogMessage(id = 172017, value = "Tried to correct invalid \"host\" value \"0.0.0.0\" for \"{}\" connector, but received an exception.",
level = LogMessage.Level.WARN)
- void failedToCorrectHost(@Cause Exception e, String name);
+ void failedToCorrectHost(String name, @Cause Exception e);
@LogMessage(id = 172018, value = "Could not start recovery discovery on {}, we will retry every recovery scan until the server is available",
level = LogMessage.Level.WARN)
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
index 28fa5145d4..3e49012344 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
@@ -216,7 +216,7 @@ public class ActiveMQXAResourceWrapper implements XAResource, SessionFailureList
logger.debug("being disconnected for server shutdown", me);
}
} else {
- ActiveMQXARecoveryLogger.LOGGER.xaRecoverConnectionError(me, csf);
+ ActiveMQXARecoveryLogger.LOGGER.xaRecoverConnectionError(csf, me);
}
close();
}
@@ -321,7 +321,7 @@ public class ActiveMQXAResourceWrapper implements XAResource, SessionFailureList
cs = csf.createSession(xaRecoveryConfig.getUsername(), xaRecoveryConfig.getPassword(), true, false, false, false, 1);
}
} catch (Throwable e) {
- ActiveMQXARecoveryLogger.LOGGER.xaRecoverAutoConnectionError(e, xaRecoveryConfig);
+ ActiveMQXARecoveryLogger.LOGGER.xaRecoverAutoConnectionError(xaRecoveryConfig, e);
if (logger.isDebugEnabled()) {
logger.debug(e.getMessage(), e);
}
[activemq-artemis] 34/42: some more helper additions to bring default assembly logging config into line with prior config
Posted by cl...@apache.org.
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 db0d5b41a2783a675d4ff730167365bd3a46f969
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 11:14:11 2022 +0100
some more helper additions to bring default assembly logging config into line with prior config
---
.../cli/commands/etc/log4j2-config.properties | 25 +++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
index e7c4bb41b1..8a32c0ad47 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
@@ -14,11 +14,26 @@
# limitations under the License.
# Log4J 2 configuration
+
rootLogger = INFO, console, log_file
logger.activemq.name=org.apache.activemq
logger.activemq.level=INFO
+logger.artemis_server.name=org.apache.activemq.artemis.core.server
+logger.artemis_server.level=INFO
+
+logger.artemis_journal.name=org.apache.activemq.artemis.journal
+logger.artemis_journal.level=INFO
+
+logger.artemis_utils.name=org.apache.activemq.artemis.utils
+logger.artemis_utils.level=INFO
+
+# CriticalAnalyzer: If you have issues with the CriticalAnalyzer, setting this to TRACE would give
+# you extra troubleshooting info, but do not use TRACE regularly as it would incur extra CPU usage.
+logger.critical_analyzer.name=org.apache.activemq.artemis.utils.critical
+logger.critical_analyzer.level=INFO
+
# Audit loggers: to enable change levels from OFF to INFO
logger.audit_base = OFF, audit_log_file
logger.audit_base.name = org.apache.activemq.audit.base
@@ -32,16 +47,16 @@ logger.audit_message = OFF, audit_log_file
logger.audit_message.name = org.apache.activemq.audit.message
logger.audit_message.additivity = false
-# quorum logger levels
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
+
+# Quorum related logger levels
logger.curator.name=org.apache.curator
logger.curator.level=WARN
logger.zookeeper.name=org.apache.zookeeper
logger.zookeeper.level=ERROR
-# Jetty logger levels
-logger.jetty.name=org.eclipse.jetty
-logger.jetty.level=WARN
-
# Console appender
appender.console.type=Console
[activemq-artemis] 33/42: Adding a test with no argument on exception (just to be sure)
Posted by cl...@apache.org.
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 53d6eb1555ba80d4011f42769a232cd21a8ac8b6
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Thu Jul 21 13:51:02 2022 -0400
Adding a test with no argument on exception (just to be sure)
---
.../artemis/logprocessor/SimpleBundle.java | 4 ++++
.../artemis/logprocessor/SimpleBundleTest.java | 23 ++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java
index a272894162..7f18d3512f 100644
--- a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java
+++ b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java
@@ -75,6 +75,10 @@ public interface SimpleBundle {
@LogMessage(id = 15, value = "Long with 5 parameters p{} p{} p{} p{} p{}", level = LogMessage.Level.WARN)
void longParameters(String p1, String p2, String p3, String p4, String p5);
+ @LogMessage(id = 16, value = "An Exceptional example", level = LogMessage.Level.WARN)
+ void onlyException(MyException e);
+
+
@GetLogger
Logger getLogger();
diff --git a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
index 7d0a1eadf9..9b79db82cf 100644
--- a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
+++ b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
@@ -148,6 +148,29 @@ public class SimpleBundleTest {
}
+ @Test
+ public void onlyException() {
+ try {
+ AssertionLoggerHandler.startCapture(false, false);
+
+ SimpleBundle.MESSAGES.onlyException(createMyException("MSG7777"));
+
+ Assert.assertTrue(AssertionLoggerHandler.findText("TST16"));
+ Assert.assertFalse(AssertionLoggerHandler.findText("MSG7777"));
+
+ AssertionLoggerHandler.clear();
+
+ AssertionLoggerHandler.startCapture(false, true);
+ SimpleBundle.MESSAGES.onlyException(createMyException("MSG7777"));
+ Assert.assertTrue(AssertionLoggerHandler.findText("TST16"));
+ Assert.assertTrue(AssertionLoggerHandler.findText("MSG7777"));
+ Assert.assertTrue(AssertionLoggerHandler.findText("createMyException"));
+ } finally {
+ AssertionLoggerHandler.stopCapture();
+ }
+ }
+
+
// I'm doing it on a method just to assert if this method will appear on the stack trace
private MyException createMyException(String message) {
return new MyException(message);
[activemq-artemis] 39/42: ARTEMIS-3902 Adding Reason to Security Exception
Posted by cl...@apache.org.
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 47a66ec9ffbd5b54a1708a443e1058c16db95f22
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Fri Jul 22 11:46:35 2022 -0400
ARTEMIS-3902 Adding Reason to Security Exception
---
.../main/java/org/apache/activemq/artemis/logs/AuditLogger.java | 8 ++++----
.../activemq/artemis/core/security/impl/SecurityStoreImpl.java | 2 +-
2 files changed, 5 insertions(+), 5 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 705f3af314..75e406d240 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
@@ -1994,12 +1994,12 @@ public interface AuditLogger {
void handleManagementMessage2(String user, Object source, String args);
- static void securityFailure(Exception cause) {
- BASE_LOGGER.securityFailure(getCaller(), cause);
+ static void securityFailure(String reason, Exception cause) {
+ BASE_LOGGER.securityFailure(getCaller(), reason, cause);
}
- @LogMessage(id = 601264, value = "User {} gets security check failure", level = LogMessage.Level.INFO)
- void securityFailure(String user, Throwable cause);
+ @LogMessage(id = 601264, value = "User {} gets security check failure, reason = {}", level = LogMessage.Level.INFO)
+ void securityFailure(String user, String reason, Throwable cause);
static void createCoreConsumer(Object source, Subject user, String remoteAddress, Object... args) {
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 fd13dd79bd..06c454e98a 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
@@ -291,7 +291,7 @@ public class SecurityStoreImpl implements SecurityStore, HierarchicalRepositoryC
} else {
ex = ActiveMQMessageBundle.BUNDLE.userNoPermissionsQueue(session.getUsername(), checkType, bareQueue, bareAddress);
}
- AuditLogger.securityFailure(ex);
+ AuditLogger.securityFailure(ex.getMessage(), ex);
throw ex;
}
[activemq-artemis] 18/42: Fixing up some {0} versus {}
Posted by cl...@apache.org.
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 b670de4286a0cec70baac2a150a7e478836cda4d
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Thu Jul 14 15:34:54 2022 -0400
Fixing up some {0} versus {}
---
.../artemis/core/client/ActiveMQClientLogger.java | 62 +++++++++++-----------
.../core/client/ActiveMQClientMessageBundle.java | 38 ++++++-------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index 5beb963958..c35e4fab22 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -46,19 +46,19 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 212004, value = "Failed to connect to server.", level = LogMessage.Level.WARN)
void failedToConnectToServer();
- @LogMessage(id = 212005, value = "Tried {0} times to connect. Now giving up on reconnecting it.", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212005, value = "Tried {} times to connect. Now giving up on reconnecting it.", level = LogMessage.Level.WARN)
void failedToConnectToServer(Integer reconnectAttempts);
@LogMessage(id = 212007, value = "connector.create or connectorFactory.createConnector should never throw an exception, implementation is badly behaved, but we will deal with it anyway.", level = LogMessage.Level.WARN)
void createConnectorException(@Cause Exception e);
- @LogMessage(id = 212008, value = "I am closing a core ClientSessionFactory you left open. Please make sure you close all ClientSessionFactories explicitly " + "before letting them go out of scope! {0}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212008, value = "I am closing a core ClientSessionFactory you left open. Please make sure you close all ClientSessionFactories explicitly " + "before letting them go out of scope! {}", level = LogMessage.Level.WARN)
void factoryLeftOpen(@Cause Exception e, int i);
@LogMessage(id = 212009, value = "resetting session after failure", level = LogMessage.Level.WARN)
void resettingSessionAfterFailure();
- @LogMessage(id = 212010, value = "Server is starting, retry to create the session {0}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212010, value = "Server is starting, retry to create the session {}", level = LogMessage.Level.WARN)
void retryCreateSessionSeverStarting(String name);
@LogMessage(id = 212011, value = "committing transaction after failover occurred, any non persistent messages may be lost", level = LogMessage.Level.WARN)
@@ -73,7 +73,7 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 212015, value = "failover occurred during prepare rolling back", level = LogMessage.Level.WARN)
void errorDuringPrepare(@Cause Throwable e);
- @LogMessage(id = 212016, value = "I am closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly before letting them go out of scope! {0}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212016, value = "I am closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly before letting them go out of scope! {}", level = LogMessage.Level.WARN)
void clientSessionNotClosed(@Cause Exception e, int identity);
@LogMessage(id = 212017, value = "error adding packet", level = LogMessage.Level.WARN)
@@ -125,19 +125,19 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 212033, value = "unable to send notification when discovery group is stopped", level = LogMessage.Level.WARN)
void errorSendingNotifOnDiscoveryStop(@Cause Throwable e);
- @LogMessage(id = 212034, value = "There are more than one servers on the network broadcasting the same node id. " + "You will see this message exactly once (per node) if a node is restarted, in which case it can be safely " + "ignored. But if it is logged continuously it means you really do have more than one node on the same network " + "active concurrently with the same node id. This could occur if you have a backup node active at the same time as " + "its live node. nodeID={0}", le [...]
+ @LogMessage(id = 212034, value = "There are more than one servers on the network broadcasting the same node id. " + "You will see this message exactly once (per node) if a node is restarted, in which case it can be safely " + "ignored. But if it is logged continuously it means you really do have more than one node on the same network " + "active concurrently with the same node id. This could occur if you have a backup node active at the same time as " + "its live node. nodeID={}", lev [...]
void multipleServersBroadcastingSameNode(String nodeId);
@LogMessage(id = 212035, value = "error receiving packet in discovery", level = LogMessage.Level.WARN)
void errorReceivingPacketInDiscovery(@Cause Throwable e);
- @LogMessage(id = 212036, value = "Can not find packet to clear: {0} last received command id first stored command id {1}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212036, value = "Can not find packet to clear: {} last received command id first stored command id {}", level = LogMessage.Level.WARN)
void cannotFindPacketToClear(Integer lastReceivedCommandID, Integer firstStoredCommandID);
- @LogMessage(id = 212037, value = "Connection failure to {0} has been detected: {1} [code={2}]", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212037, value = "Connection failure to {} has been detected: {} [code={}]", level = LogMessage.Level.WARN)
void connectionFailureDetected(String remoteAddress, String message, ActiveMQExceptionType type);
- @LogMessage(id = 212038, value = "Failure in calling interceptor: {0}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212038, value = "Failure in calling interceptor: {}", level = LogMessage.Level.WARN)
void errorCallingInterceptor(@Cause Throwable e, Interceptor interceptor);
@LogMessage(id = 212040, value = "Timed out waiting for netty ssl close future to complete", level = LogMessage.Level.WARN)
@@ -149,34 +149,34 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 212042, value = "Timed out waiting for packet to be flushed", level = LogMessage.Level.WARN)
void timeoutFlushingPacket();
- @LogMessage(id = 212043, value = "Property {0} must be an Integer, it is {1}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212043, value = "Property {} must be an Integer, it is {}", level = LogMessage.Level.WARN)
void propertyNotInteger(String propName, String name);
- @LogMessage(id = 212044, value = "Property {0} must be a Long, it is {1}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212044, value = "Property {} must be a Long, it is {}", level = LogMessage.Level.WARN)
void propertyNotLong(String propName, String name);
- @LogMessage(id = 212045, value = "Property {0} must be a Boolean, it is {1}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212045, value = "Property {} must be a Boolean, it is {}", level = LogMessage.Level.WARN)
void propertyNotBoolean(String propName, String name);
- @LogMessage(id = 212046, value = "Cannot find activemq-version.properties on classpath: {0}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212046, value = "Cannot find activemq-version.properties on classpath: {}", level = LogMessage.Level.WARN)
void noVersionOnClasspath(String classpath);
- @LogMessage(id = 212047, value = "Warning: JVM allocated more data what would make results invalid {0}:{1}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212047, value = "Warning: JVM allocated more data what would make results invalid {}:{}", level = LogMessage.Level.WARN)
void jvmAllocatedMoreMemory(Long totalMemory1, Long totalMemory2);
- @LogMessage(id = 212048, value = "Random address ({0}) was already in use, trying another time", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212048, value = "Random address ({}) was already in use, trying another time", level = LogMessage.Level.WARN)
void broadcastGroupBindErrorRetry(String hostAndPort, @Cause Throwable t);
- @LogMessage(id = 212049, value = "Could not bind to {0} ({1} address); " + "make sure your discovery group-address is of the same type as the IP stack (IPv4 or IPv6)." + "\nIgnoring discovery group-address, but this may lead to cross talking.", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212049, value = "Could not bind to {} ({} address); " + "make sure your discovery group-address is of the same type as the IP stack (IPv4 or IPv6)." + "\nIgnoring discovery group-address, but this may lead to cross talking.", level = LogMessage.Level.WARN)
void ioDiscoveryError(String hostAddress, String s);
- @LogMessage(id = 212050, value = "Compressed large message tried to read {0} bytes from stream {1}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212050, value = "Compressed large message tried to read {} bytes from stream {}", level = LogMessage.Level.WARN)
void compressedLargeMessageError(int length, int nReadBytes);
@LogMessage(id = 212051, value = "Invalid concurrent session usage. Sessions are not supposed to be used by more than one thread concurrently.", level = LogMessage.Level.WARN)
void invalidConcurrentSessionUsage(@Cause Throwable t);
- @LogMessage(id = 212052, value = "Packet {0} was answered out of sequence due to a previous server timeout and it''s being ignored", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212052, value = "Packet {} was answered out of sequence due to a previous server timeout and it''s being ignored", level = LogMessage.Level.WARN)
void packetOutOfOrder(Object obj, @Cause Throwable t);
/**
@@ -187,13 +187,13 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 212053, value = "CompletionListener/SendAcknowledgementHandler used with confirmationWindowSize=-1. Enable confirmationWindowSize to receive acks from server!", level = LogMessage.Level.WARN)
void confirmationWindowDisabledWarning();
- @LogMessage(id = 212054, value = "Destination address={0} is blocked. If the system is configured to block make sure you consume messages on this configuration.", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212054, value = "Destination address={} is blocked. If the system is configured to block make sure you consume messages on this configuration.", level = LogMessage.Level.WARN)
void outOfCreditOnFlowControl(String address);
@LogMessage(id = 212055, value = "Unable to close consumer", level = LogMessage.Level.WARN)
void unableToCloseConsumer(@Cause Exception e);
- @LogMessage(id = 212056, value = "local-bind-address specified for broadcast group but no local-bind-port. Using random port for UDP Broadcast ({0})", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212056, value = "local-bind-address specified for broadcast group but no local-bind-port. Using random port for UDP Broadcast ({})", level = LogMessage.Level.WARN)
void broadcastGroupBindError(String hostAndPort);
@LogMessage(id = 212057, value = "Large Message Streaming is taking too long to flush on back pressure.", level = LogMessage.Level.WARN)
@@ -202,7 +202,7 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 212058, value = "Unable to get a message.", level = LogMessage.Level.WARN)
void unableToGetMessage(@Cause Exception e);
- @LogMessage(id = 212059, value = "Failed to clean up: {0} ", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212059, value = "Failed to clean up: {} ", level = LogMessage.Level.WARN)
void failedCleaningUp(String target);
@LogMessage(id = 212060, value = "Unexpected null data received from DiscoveryEndpoint ", level = LogMessage.Level.WARN)
@@ -220,7 +220,7 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 212064, value = "Unable to receive cluster topology ", level = LogMessage.Level.WARN)
void unableToReceiveClusterTopology(@Cause Throwable e);
- @LogMessage(id = 212065, value = "{0} getting exception when receiving broadcasting ", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212065, value = "{} getting exception when receiving broadcasting ", level = LogMessage.Level.WARN)
void unableToReceiveBroadcast(@Cause Exception e, String target);
@LogMessage(id = 212066, value = "failed to parse int property ", level = LogMessage.Level.WARN)
@@ -253,13 +253,13 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 212076, value = "Epoll is not available, please add to the classpath or configure useEpoll=false to remove this warning", level = LogMessage.Level.WARN)
void unableToCheckEpollAvailabilitynoClass();
- @LogMessage(id = 212077, value = "Timed out waiting to receive initial broadcast from cluster. Retry {0} of {1}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212077, value = "Timed out waiting to receive initial broadcast from cluster. Retry {} of {}", level = LogMessage.Level.WARN)
void broadcastTimeout(int retry, int maxretry);
- @LogMessage(id = 212079, value = "The upstream connector from the downstream federation will ignore url parameter {0}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212079, value = "The upstream connector from the downstream federation will ignore url parameter {}", level = LogMessage.Level.WARN)
void ignoredParameterForDownstreamFederation(String name);
- @LogMessage(id = 212080, value = "Using legacy SSL store provider value: {0}. Please use either ''keyStoreType'' or ''trustStoreType'' instead as appropriate.", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212080, value = "Using legacy SSL store provider value: {}. Please use either ''keyStoreType'' or ''trustStoreType'' instead as appropriate.", level = LogMessage.Level.WARN)
void oldStoreProvider(String value);
@LogMessage(id = 214000, value = "Failed to call onMessage", level = LogMessage.Level.ERROR)
@@ -277,7 +277,7 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 214004, value = "XA end operation failed ", level = LogMessage.Level.ERROR)
void errorCallingEnd(@Cause Throwable t);
- @LogMessage(id = 214005, value = "XA start operation failed {0} code:{1}", level = LogMessage.Level.ERROR)
+ @LogMessage(id = 214005, value = "XA start operation failed {} code:{}", level = LogMessage.Level.ERROR)
void errorCallingStart(String message, Integer code);
@LogMessage(id = 214006, value = "Session is not XA", level = LogMessage.Level.ERROR)
@@ -313,28 +313,28 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 214017, value = "Caught unexpected Throwable", level = LogMessage.Level.ERROR)
void caughtunexpectedThrowable(@Cause Throwable t);
- @LogMessage(id = 214018, value = "Failed to invoke getTextContent() on node {0}", level = LogMessage.Level.ERROR)
+ @LogMessage(id = 214018, value = "Failed to invoke getTextContent() on node {}", level = LogMessage.Level.ERROR)
void errorOnXMLTransform(@Cause Throwable t, Node n);
@LogMessage(id = 214019, value = "Invalid configuration", level = LogMessage.Level.ERROR)
void errorOnXMLTransformInvalidConf(@Cause Throwable t);
- @LogMessage(id = 214020, value = "Exception happened while stopping Discovery BroadcastEndpoint {0}", level = LogMessage.Level.ERROR)
+ @LogMessage(id = 214020, value = "Exception happened while stopping Discovery BroadcastEndpoint {}", level = LogMessage.Level.ERROR)
void errorStoppingDiscoveryBroadcastEndpoint(Object endpoint, @Cause Throwable t);
- @LogMessage(id = 214021, value = "Invalid cipher suite specified. Supported cipher suites are: {0}", level = LogMessage.Level.ERROR)
+ @LogMessage(id = 214021, value = "Invalid cipher suite specified. Supported cipher suites are: {}", level = LogMessage.Level.ERROR)
void invalidCipherSuite(String validSuites);
- @LogMessage(id = 214022, value = "Invalid protocol specified. Supported protocols are: {0}", level = LogMessage.Level.ERROR)
+ @LogMessage(id = 214022, value = "Invalid protocol specified. Supported protocols are: {}", level = LogMessage.Level.ERROR)
void invalidProtocol(String validProtocols);
- @LogMessage(id = 214025, value = "Invalid type {0}, Using default connection factory at {1}", level = LogMessage.Level.ERROR)
+ @LogMessage(id = 214025, value = "Invalid type {}, Using default connection factory at {}", level = LogMessage.Level.ERROR)
void invalidCFType(String type, String uri);
@LogMessage(id = 214029, value = "Unexpected response from HTTP server: %s", level = LogMessage.Level.ERROR)
void unexpectedResponseFromHttpServer(Object response);
- @LogMessage(id = 214030, value = "Failed to bind {0}={1}", level = LogMessage.Level.ERROR)
+ @LogMessage(id = 214030, value = "Failed to bind {}={}", level = LogMessage.Level.ERROR)
void failedToBind(String p1, String p2, @Cause Throwable cause);
@LogMessage(id = 214031, value = "Failed to decode buffer, disconnect immediately.", level = LogMessage.Level.ERROR)
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
index 219c184de4..753b46fa06 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
@@ -81,16 +81,16 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219010, value = "Connection is destroyed")
ActiveMQNotConnectedException connectionDestroyed();
- @Message(id = 219011, value = "Did not receive data from server for {0}")
+ @Message(id = 219011, value = "Did not receive data from server for {}")
ActiveMQConnectionTimedOutException connectionTimedOut(Connection transportConnection);
@Message(id = 219012, value = "Timed out waiting to receive initial broadcast from cluster")
ActiveMQConnectionTimedOutException connectionTimedOutInInitialBroadcast();
- @Message(id = 219013, value = "Timed out waiting to receive cluster topology. Group:{0}")
+ @Message(id = 219013, value = "Timed out waiting to receive cluster topology. Group:{}")
ActiveMQConnectionTimedOutException connectionTimedOutOnReceiveTopology(DiscoveryGroup discoveryGroup);
- @Message(id = 219014, value = "Timed out after waiting {0} ms for response when sending packet {1}")
+ @Message(id = 219014, value = "Timed out after waiting {} ms for response when sending packet {}")
ActiveMQConnectionTimedOutException timedOutSendingPacket(long timeout, Byte type);
@Message(id = 219015, value = "The connection was disconnected because of server shutdown")
@@ -114,7 +114,7 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219021, value = "Cannot set MessageHandler - consumer is in receive(...)")
ActiveMQIllegalStateException inReceive();
- @Message(id = 219022, value = "Header size ({0}) is too big, use the messageBody for large data, or increase minLargeMessageSize")
+ @Message(id = 219022, value = "Header size ({}) is too big, use the messageBody for large data, or increase minLargeMessageSize")
ActiveMQIllegalStateException headerSizeTooBig(Integer headerSize);
@Message(id = 219023, value = "The large message lost connection with its session, either because of a rollback or a closed session")
@@ -144,22 +144,22 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219031, value = "The transaction was rolled back on failover however commit may have been successful")
ActiveMQTransactionOutcomeUnknownException txOutcomeUnknown();
- @Message(id = 219032, value = "Invalid type: {0}")
+ @Message(id = 219032, value = "Invalid type: {}")
IllegalArgumentException invalidType(Object type);
- @Message(id = 219033, value = "Invalid type: {0}")
+ @Message(id = 219033, value = "Invalid type: {}")
IllegalArgumentException invalidEncodeType(Object type);
- @Message(id = 219034, value = "Params for management operations must be of the following type: int long double String boolean Map or array thereof but found {0}")
+ @Message(id = 219034, value = "Params for management operations must be of the following type: int long double String boolean Map or array thereof but found {}")
IllegalArgumentException invalidManagementParam(Object type);
- @Message(id = 219035, value = "Invalid window size {0}")
+ @Message(id = 219035, value = "Invalid window size {}")
IllegalArgumentException invalidWindowSize(Integer size);
- @Message(id = 219037, value = "Invalid last Received Command ID: {0}")
+ @Message(id = 219037, value = "Invalid last Received Command ID: {}")
IllegalArgumentException invalidCommandID(Integer lastReceivedCommandID);
- @Message(id = 219038, value = "Cannot find channel with id {0} to close")
+ @Message(id = 219038, value = "Cannot find channel with id {} to close")
IllegalArgumentException noChannelToClose(Long id);
@Message(id = 219039, value = "Close Listener cannot be null")
@@ -168,7 +168,7 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219040, value = "Fail Listener cannot be null")
IllegalArgumentException failListenerCannotBeNull();
- @Message(id = 219041, value = "Connection already exists with id {0}")
+ @Message(id = 219041, value = "Connection already exists with id {}")
IllegalArgumentException connectionExists(Object id);
@Message(id = 219042, value = "Invalid argument null listener")
@@ -189,7 +189,7 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219048, value = "nodes have a different number of attributes")
IllegalArgumentException nodeHaveDifferentAttNumber();
- @Message(id = 219049, value = "attribute {0}={1} does not match")
+ @Message(id = 219049, value = "attribute {}={} does not match")
IllegalArgumentException attsDontMatch(String name, String value);
@Message(id = 219050, value = "one node has children and the other does not")
@@ -198,25 +198,25 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219051, value = "nodes have a different number of children")
IllegalArgumentException nodeHasDifferentChildNumber();
- @Message(id = 219052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean")
+ @Message(id = 219052, value = "Element {} requires a valid Boolean value, but ''{}'' cannot be parsed as a Boolean")
IllegalArgumentException mustBeBoolean(Node elem, String value);
- @Message(id = 219053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double")
+ @Message(id = 219053, value = "Element {} requires a valid Double value, but ''{}'' cannot be parsed as a Double")
IllegalArgumentException mustBeDouble(Node elem, String value);
- @Message(id = 219054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as an Integer")
+ @Message(id = 219054, value = "Element {} requires a valid Integer value, but ''{}'' cannot be parsed as an Integer")
IllegalArgumentException mustBeInteger(Node elem, String value);
- @Message(id = 219055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long")
+ @Message(id = 219055, value = "Element {} requires a valid Long value, but ''{}'' cannot be parsed as a Long")
IllegalArgumentException mustBeLong(Node element, String value);
@Message(id = 219057, value = "Error decoding password")
IllegalArgumentException errordecodingPassword(@Cause Exception e);
- @Message(id = 219058, value = "Address \"{0}\" is full. Message encode size = {1}B")
+ @Message(id = 219058, value = "Address \"{}\" is full. Message encode size = {}B")
ActiveMQAddressFullException addressIsFull(String addressName, int size);
- @Message(id = 219059, value = "Interceptor {0} rejected packet in a blocking call. This call will never complete.")
+ @Message(id = 219059, value = "Interceptor {} rejected packet in a blocking call. This call will never complete.")
ActiveMQInterceptorRejectedPacketException interceptorRejectedPacket(String interceptionResult);
@Message(id = 219060, value = "Large Message Transmission interrupted on consumer shutdown.")
@@ -231,7 +231,7 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219063, value = "Cannot send a packet while response cache is full.")
IllegalStateException cannotSendPacketWhilstResponseCacheFull();
- @Message(id = 219064, value = "Invalide packet: {0}")
+ @Message(id = 219064, value = "Invalide packet: {}")
IllegalStateException invalidPacket(byte type);
@Message(id = 219065, value = "Failed to handle packet.")
[activemq-artemis] 23/42: fix some more placeholders missed previously
Posted by cl...@apache.org.
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 8e81c2d76ffdcd76da411dfcaccbb2ca384a377d
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 15 16:01:49 2022 +0100
fix some more placeholders missed previously
---
.../activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java | 2 +-
.../activemq/artemis/core/remoting/impl/netty/NettyConnector.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
index b091c039e6..b12e51d198 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
@@ -556,7 +556,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
private void failoverOrReconnect(final Object connectionID,
final ActiveMQException me,
String scaleDownTargetNodeID) {
- logger.debug("Failure captured on connectionID={0}, performing failover or reconnection now", connectionID, me);
+ logger.debug("Failure captured on connectionID={}, performing failover or reconnection now", connectionID, me);
for (ClientSessionInternal session : sessions) {
SessionContext context = session.getSessionContext();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index f631231f27..4c8aacd1b4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -741,7 +741,7 @@ public class NettyConnector extends AbstractConnector {
batchFlusherFuture = scheduledThreadPool.scheduleWithFixedDelay(flusher, batchDelay, batchDelay, TimeUnit.MILLISECONDS);
}
- logger.debug("Started {0} Netty Connector version {1} to {2}:{3,number,#}", connectorType, TransportConstants.NETTY_VERSION, host, port);
+ logger.debug("Started {} Netty Connector version {} to {}:{}", connectorType, TransportConstants.NETTY_VERSION, host, port);
}
private SSLEngine loadJdkSslEngine(final SSLContextConfig sslContextConfig) throws Exception {
[activemq-artemis] 22/42: make basic start on audit log file config, add [unfinished] config changes to get AuditLoggerResourceTest smoke test passing
Posted by cl...@apache.org.
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 6ccbf1503060fddc8e894eaaf6898358943cd701
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 15 13:59:06 2022 +0100
make basic start on audit log file config, add [unfinished] config changes to get AuditLoggerResourceTest smoke test passing
---
.../cli/commands/etc/log4j2-config.properties | 32 ++++++++++--
.../servers/audit-logging/log4j2-config.properties | 61 ++++++++++++++++++++++
2 files changed, 89 insertions(+), 4 deletions(-)
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
index 32ba2f9680..bebb6d4b9d 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
@@ -19,10 +19,19 @@ rootLogger = INFO, Console
logger.activemq.name=org.apache.activemq
logger.activemq.level=INFO
-# Audit logger:
-logger.audit.name=org.apache.activemq.audit
-logger.audit.level=INFO
-#TODO: copy specific audit loggers config
+# Audit loggers: to enable change levels from OFF to INFO
+logger.audit_base = OFF, audit_log_file
+logger.audit_base.name = org.apache.activemq.audit.base
+logger.audit_base.additivity = false
+
+logger.audit_resource = OFF, audit_log_file
+logger.audit_resource.name = org.apache.activemq.audit.resource
+logger.audit_resource.additivity = false
+
+logger.audit_message = OFF, audit_log_file
+logger.audit_message.name = org.apache.activemq.audit.message
+logger.audit_message.additivity = false
+
# quorum logger levels
logger.curator.name=org.apache.curator
@@ -34,4 +43,19 @@ logger.zookeeper.level=ERROR
appender.console.type=Console
appender.console.name=Console
appender.console.layout.type=PatternLayout
+#TODO: look at old/previous pattern and align
appender.console.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
+
+# Audit log file appender
+appender.audit_log_file.type = RollingFile
+appender.audit_log_file.name = audit_log_file
+appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
+#TODO: look at old/previous filename pattern and behaviour and align
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit-%d{yyyy-MM-dd}.log
+appender.audit_log_file.layout.type = PatternLayout
+appender.audit_log_file.layout.pattern = [%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
+#TODO: look at old/previous pattern and align
+appender.audit_log_file.policies.type = Policies
+appender.audit_log_file.policies.time.type = TimeBasedTriggeringPolicy
+appender.audit_log_file.policies.time.interval = 24
+appender.audit_log_file.policies.time.modulate = true
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
new file mode 100644
index 0000000000..7084e749ef
--- /dev/null
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
@@ -0,0 +1,61 @@
+# 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.
+
+# Log4J 2 configuration
+rootLogger = INFO, Console
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+# Audit loggers: to enable change levels from OFF to INFO
+logger.audit_base = INFO, audit_log_file
+logger.audit_base.name = org.apache.activemq.audit.base
+logger.audit_base.additivity = false
+
+logger.audit_resource = INFO, audit_log_file
+logger.audit_resource.name = org.apache.activemq.audit.resource
+logger.audit_resource.additivity = false
+
+logger.audit_message = INFO, audit_log_file
+logger.audit_message.name = org.apache.activemq.audit.message
+logger.audit_message.additivity = false
+
+
+# quorum logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=ERROR
+
+# Console appender
+appender.console.type=Console
+appender.console.name=Console
+appender.console.layout.type=PatternLayout
+#TODO: look at old/previous pattern and align
+appender.console.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
+
+# Audit log file appender
+appender.audit_log_file.type = RollingFile
+appender.audit_log_file.name = audit_log_file
+appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
+#TODO: look at old/previous filename pattern and behaviour and align
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit-%d{yyyy-MM-dd}.log
+appender.audit_log_file.layout.type = PatternLayout
+appender.audit_log_file.layout.pattern = [%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
+#TODO: look at old/previous pattern and align
+appender.audit_log_file.policies.type = Policies
+appender.audit_log_file.policies.time.type = TimeBasedTriggeringPolicy
+appender.audit_log_file.policies.time.interval = 24
+appender.audit_log_file.policies.time.modulate = true
[activemq-artemis] 09/42: avoid NPE in a unit test due to audit loggers still being enabled, unlike prior test logging config
Posted by cl...@apache.org.
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 994d69ce155772eb5a51a2931da3a46c1c16f5c4
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Jul 12 17:58:23 2022 +0100
avoid NPE in a unit test due to audit loggers still being enabled, unlike prior test logging config
---
tests/config/log4j2-tests-config-CI.properties | 4 ++++
tests/config/log4j2-tests-config.properties | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/tests/config/log4j2-tests-config-CI.properties b/tests/config/log4j2-tests-config-CI.properties
index 4ecac73492..b912c9aeeb 100644
--- a/tests/config/log4j2-tests-config-CI.properties
+++ b/tests/config/log4j2-tests-config-CI.properties
@@ -19,6 +19,10 @@ rootLogger = INFO, Console, Test
logger.activemq.name=org.apache.activemq
logger.activemq.level=INFO
+# Audit logger: to enable audit logs change the level to INFO
+logger.audit.name=org.apache.activemq.audit
+logger.audit.level=OFF
+
# quorum logger levels
logger.curator.name=org.apache.curator
logger.curator.level=WARN
diff --git a/tests/config/log4j2-tests-config.properties b/tests/config/log4j2-tests-config.properties
index b6dc034c43..982efa2741 100644
--- a/tests/config/log4j2-tests-config.properties
+++ b/tests/config/log4j2-tests-config.properties
@@ -19,6 +19,10 @@ rootLogger = INFO, Console, Test
logger.activemq.name=org.apache.activemq
logger.activemq.level=INFO
+# Audit logger: to enable audit logs change the level to INFO
+logger.audit.name=org.apache.activemq.audit
+logger.audit.level=OFF
+
# Console appender
appender.console.type=Console
appender.console.name=Console
[activemq-artemis] 38/42: add some TODO notes from memory
Posted by cl...@apache.org.
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 3dae6f5a9fd20a2516a4588b298c668542751cd5
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 15:29:09 2022 +0100
add some TODO notes from memory
---
TODO-new-logging.txt | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/TODO-new-logging.txt b/TODO-new-logging.txt
new file mode 100644
index 0000000000..c807fe2c44
--- /dev/null
+++ b/TODO-new-logging.txt
@@ -0,0 +1,9 @@
+TODOs not explicitly noted in the code itself already:
+
+- Fix stacktraces of generated exceptions not to include the generated 'logmessage' method creating it.
+- Remove references to wildfly-common in scripts and profiles and cli commands
+- Replace logging.config files in smoke tests needing their own custom config
+- Remove stale logging.config file from artemis-cli
+- Remove stale log4j.properties file(s) from activemq5-unit-tests
+- Restore the NettySecurityClientTest and figure out what needs changed to make it work.
+- Restore the Travis config file
[activemq-artemis] 42/42: add log config to get NettyNativeTest working
Posted by cl...@apache.org.
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 a3bc6d49a686e9b4b231ca66188540249df6c64a
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 17:45:49 2022 +0100
add log config to get NettyNativeTest working
---
.../servers/nettynative/log4j2-config.properties | 93 ++++++++++++++++++++++
.../servers/nettynative/logging.properties | 91 ---------------------
2 files changed, 93 insertions(+), 91 deletions(-)
diff --git a/tests/smoke-tests/src/main/resources/servers/nettynative/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/nettynative/log4j2-config.properties
new file mode 100644
index 0000000000..ad3f6cd2dc
--- /dev/null
+++ b/tests/smoke-tests/src/main/resources/servers/nettynative/log4j2-config.properties
@@ -0,0 +1,93 @@
+# 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.
+
+# NOTE: Added/bumped netty remoting logging config to debug level
+# Log4J 2 configuration
+
+logger.remoting_netty.name=org.apache.activemq.artemis.core.remoting.impl.netty
+logger.remoting_netty.level=DEBUG
+
+rootLogger = INFO, console, log_file
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+logger.artemis_server.name=org.apache.activemq.artemis.core.server
+logger.artemis_server.level=INFO
+
+logger.artemis_journal.name=org.apache.activemq.artemis.journal
+logger.artemis_journal.level=INFO
+
+logger.artemis_utils.name=org.apache.activemq.artemis.utils
+logger.artemis_utils.level=INFO
+
+# CriticalAnalyzer: If you have issues with the CriticalAnalyzer, setting this to TRACE would give
+# you extra troubleshooting info, but do not use TRACE regularly as it would incur extra CPU usage.
+logger.critical_analyzer.name=org.apache.activemq.artemis.utils.critical
+logger.critical_analyzer.level=INFO
+
+# Audit loggers: to enable change levels from OFF to INFO
+logger.audit_base = OFF, audit_log_file
+logger.audit_base.name = org.apache.activemq.audit.base
+logger.audit_base.additivity = false
+
+logger.audit_resource = OFF, audit_log_file
+logger.audit_resource.name = org.apache.activemq.audit.resource
+logger.audit_resource.additivity = false
+
+logger.audit_message = OFF, audit_log_file
+logger.audit_message.name = org.apache.activemq.audit.message
+logger.audit_message.additivity = false
+
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
+
+# Quorum related logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=ERROR
+
+
+# Console appender
+appender.console.type=Console
+appender.console.name=console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
+
+# Log file appender
+appender.log_file.type = RollingFile
+appender.log_file.name = log_file
+appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
+appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
+appender.log_file.layout.type = PatternLayout
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%n
+appender.log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
+
+# Audit log file appender
+appender.audit_log_file.type = RollingFile
+appender.audit_log_file.name = audit_log_file
+appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
+appender.audit_log_file.layout.type = PatternLayout
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
+appender.audit_log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
diff --git a/tests/smoke-tests/src/main/resources/servers/nettynative/logging.properties b/tests/smoke-tests/src/main/resources/servers/nettynative/logging.properties
deleted file mode 100644
index 1847064eaf..0000000000
--- a/tests/smoke-tests/src/main/resources/servers/nettynative/logging.properties
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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.utils.critical,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,org.apache.curator,org.apache.zookeeper,org.apache.activemq.artemis.core.remoting.impl.netty
-
-# 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.core.remoting.impl.netty.level=DEBUG
-
-# if you have issues with CriticalAnalyzer, setting this as TRACE would give you extra troubleshooting information.
-# but do not use it regularly as it would incur in some extra CPU usage for this diagnostic.
-logger.org.apache.activemq.artemis.utils.critical.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
-
-# quorum logger levels
-logger.org.apache.curator.level=WARN
-logger.org.apache.zookeeper.level=ERROR
-
-# to enable audit change the level to INFO
-logger.org.apache.activemq.audit.base.level=ERROR
-logger.org.apache.activemq.audit.base.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.base.useParentHandlers=false
-
-logger.org.apache.activemq.audit.resource.level=ERROR
-logger.org.apache.activemq.audit.resource.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.resource.useParentHandlers=false
-
-logger.org.apache.activemq.audit.message.level=ERROR
-logger.org.apache.activemq.audit.message.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.message.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=${artemis.instance}/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=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.AUDIT_FILE.level=INFO
-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=${artemis.instance}/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
[activemq-artemis] 27/42: Enforcing exception as the last argument
Posted by cl...@apache.org.
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 6b1814108ff95b4bbc1527f676facee8c97073a8
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Thu Jul 21 10:42:08 2022 -0400
Enforcing exception as the last argument
---
.../java/org/apache/activemq/artemis/logprocessor/LogProcessor.java | 4 ++++
.../apache/activemq/artemis/logprocessor/annotation/LogBundle.java | 2 ++
.../java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
index 2d7c7f706a..5f077ab0cc 100644
--- a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
+++ b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
@@ -383,6 +383,10 @@ public class LogProcessor extends AbstractProcessor {
debug("Parameter " + parameter + (isException? "is" : "is not") + " an exception");
}
+ if (bundleAnnotation.enforceExceptionParameterAsLast() && isException && parameters.hasNext()) {
+ throw new IllegalArgumentException("Exception argument " + parameter + " has to be the last argument on the list. Look at " + executableMember);
+ }
+
if (!isException) {
nonExceptionParameters.add(parameter);
}
diff --git a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/annotation/LogBundle.java b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/annotation/LogBundle.java
index e8910bbaf1..fbfcb37fc0 100644
--- a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/annotation/LogBundle.java
+++ b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/annotation/LogBundle.java
@@ -27,4 +27,6 @@ import java.lang.annotation.Target;
public @interface LogBundle {
String projectCode();
+
+ boolean enforceExceptionParameterAsLast() default true;
}
diff --git a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java
index 5780e13abd..a272894162 100644
--- a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java
+++ b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java
@@ -25,7 +25,7 @@ import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
import org.slf4j.Logger;
-@LogBundle(projectCode = "TST")
+@LogBundle(projectCode = "TST", enforceExceptionParameterAsLast = false)
public interface SimpleBundle {
SimpleBundle MESSAGES = CodeFactory.getCodeClass(SimpleBundle.class);
[activemq-artemis] 06/42: fixup for release profile following prior rebases+squashes
Posted by cl...@apache.org.
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 2291f0e96e822a770d9a6a2139b14f6378f5abaf
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 11 16:47:12 2022 +0100
fixup for release profile following prior rebases+squashes
---
artemis-website/pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/artemis-website/pom.xml b/artemis-website/pom.xml
index bb766687d9..18f7019576 100644
--- a/artemis-website/pom.xml
+++ b/artemis-website/pom.xml
@@ -117,12 +117,6 @@
</dependency>
<!-- stuff needed to resolve various classes during javadoc processing -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
@@ -134,6 +128,12 @@
<artifactId>jsr305</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-processor</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
[activemq-artemis] 31/42: fix up errorprone error and an IDE warning
Posted by cl...@apache.org.
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 4852c804804ec714d01799ab5220f98b38dfd05e
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jul 21 16:49:11 2022 +0100
fix up errorprone error and an IDE warning
---
.../java/org/apache/activemq/artemis/logprocessor/MyException.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/MyException.java b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/MyException.java
index 1c99e60d01..80f7daac55 100644
--- a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/MyException.java
+++ b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/MyException.java
@@ -19,6 +19,8 @@ package org.apache.activemq.artemis.logprocessor;
public class MyException extends Exception {
+ private static final long serialVersionUID = 1L;
+
public MyException(String error) {
super(error);
}
@@ -27,6 +29,7 @@ public class MyException extends Exception {
super(error, cause);
}
+ @Override
public String toString() {
return getMessage();
}
[activemq-artemis] 20/42: remove now-unnecessary quote escaping from log/message bundle format strings, giving same output as before switch to slf4j formatter
Posted by cl...@apache.org.
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 d2faca81a3f18f572f5426954e9f1d2e4ef63bca
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 15 12:37:32 2022 +0100
remove now-unnecessary quote escaping from log/message bundle format strings, giving same output as before switch to slf4j formatter
---
.../artemis/core/client/ActiveMQClientLogger.java | 4 +--
.../core/client/ActiveMQClientMessageBundle.java | 8 ++---
.../jms/client/ActiveMQJMSClientBundle.java | 2 +-
.../jms/client/ActiveMQJMSClientLogger.java | 2 +-
.../jms/server/ActiveMQJMSServerBundle.java | 4 +--
.../artemis/journal/ActiveMQJournalLogger.java | 4 +--
.../stomp/ActiveMQStompProtocolMessageBundle.java | 4 +--
.../activemq/artemis/rest/ActiveMQRestLogger.java | 2 +-
.../artemis/core/server/ActiveMQMessageBundle.java | 25 ++++++++--------
.../artemis/core/server/ActiveMQServerLogger.java | 34 +++++++++++-----------
10 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index c35e4fab22..2389dabbe9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -176,7 +176,7 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 212051, value = "Invalid concurrent session usage. Sessions are not supposed to be used by more than one thread concurrently.", level = LogMessage.Level.WARN)
void invalidConcurrentSessionUsage(@Cause Throwable t);
- @LogMessage(id = 212052, value = "Packet {} was answered out of sequence due to a previous server timeout and it''s being ignored", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212052, value = "Packet {} was answered out of sequence due to a previous server timeout and it's being ignored", level = LogMessage.Level.WARN)
void packetOutOfOrder(Object obj, @Cause Throwable t);
/**
@@ -259,7 +259,7 @@ public interface ActiveMQClientLogger {
@LogMessage(id = 212079, value = "The upstream connector from the downstream federation will ignore url parameter {}", level = LogMessage.Level.WARN)
void ignoredParameterForDownstreamFederation(String name);
- @LogMessage(id = 212080, value = "Using legacy SSL store provider value: {}. Please use either ''keyStoreType'' or ''trustStoreType'' instead as appropriate.", level = LogMessage.Level.WARN)
+ @LogMessage(id = 212080, value = "Using legacy SSL store provider value: {}. Please use either 'keyStoreType' or 'trustStoreType' instead as appropriate.", level = LogMessage.Level.WARN)
void oldStoreProvider(String value);
@LogMessage(id = 214000, value = "Failed to call onMessage", level = LogMessage.Level.ERROR)
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
index 753b46fa06..41970dbe72 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
@@ -198,16 +198,16 @@ public interface ActiveMQClientMessageBundle {
@Message(id = 219051, value = "nodes have a different number of children")
IllegalArgumentException nodeHasDifferentChildNumber();
- @Message(id = 219052, value = "Element {} requires a valid Boolean value, but ''{}'' cannot be parsed as a Boolean")
+ @Message(id = 219052, value = "Element {} requires a valid Boolean value, but '{}' cannot be parsed as a Boolean")
IllegalArgumentException mustBeBoolean(Node elem, String value);
- @Message(id = 219053, value = "Element {} requires a valid Double value, but ''{}'' cannot be parsed as a Double")
+ @Message(id = 219053, value = "Element {} requires a valid Double value, but '{}' cannot be parsed as a Double")
IllegalArgumentException mustBeDouble(Node elem, String value);
- @Message(id = 219054, value = "Element {} requires a valid Integer value, but ''{}'' cannot be parsed as an Integer")
+ @Message(id = 219054, value = "Element {} requires a valid Integer value, but '{}' cannot be parsed as an Integer")
IllegalArgumentException mustBeInteger(Node elem, String value);
- @Message(id = 219055, value = "Element {} requires a valid Long value, but ''{}'' cannot be parsed as a Long")
+ @Message(id = 219055, value = "Element {} requires a valid Long value, but '{}' cannot be parsed as a Long")
IllegalArgumentException mustBeLong(Node element, String value);
@Message(id = 219057, value = "Error decoding password")
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java
index d7db959e63..cb376888d7 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java
@@ -81,7 +81,7 @@ public interface ActiveMQJMSClientBundle {
@Message(id = 139011, value = "LargeMessage streaming is only possible on ByteMessage or StreamMessage")
IllegalStateException onlyValidForByteOrStreamMessages();
- @Message(id = 139012, value = "The property name ''{}'' is not a valid java identifier.")
+ @Message(id = 139012, value = "The property name '{}' is not a valid java identifier.")
JMSRuntimeException invalidJavaIdentifier(String propertyName);
@Message(id = 139013, value = "Message is read-only")
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java
index 6ff4281a93..f2f81030ba 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java
@@ -40,7 +40,7 @@ public interface ActiveMQJMSClientLogger {
ActiveMQJMSClientLogger LOGGER = CodeFactory.getCodeClass(ActiveMQJMSClientLogger.class, ActiveMQJMSClientLogger.class.getPackage().getName());
- @LogMessage(id = 132000, value = "I''m closing a JMS connection you left open. Please make sure you close all JMS connections explicitly before letting them go out of scope! see stacktrace to find out where it was created", level = LogMessage.Level.WARN)
+ @LogMessage(id = 132000, value = "I'm closing a JMS connection you left open. Please make sure you close all JMS connections explicitly before letting them go out of scope! see stacktrace to find out where it was created", level = LogMessage.Level.WARN)
void connectionLeftOpen(@Cause Exception e);
@LogMessage(id = 132001, value = "Unhandled exception thrown from onMessage", level = LogMessage.Level.WARN)
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
index a53ec42c8d..2caf27c0cc 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
@@ -35,13 +35,13 @@ public interface ActiveMQJMSServerBundle {
@Message(id = 129000, value = "Connection Factory {} does not exist")
ActiveMQInternalErrorException cfDoesntExist(String name);
- @Message(id = 129003, value = "Discovery Group ''{}'' does not exist on main config")
+ @Message(id = 129003, value = "Discovery Group '{}' does not exist on main config")
ActiveMQIllegalStateException discoveryGroupDoesntExist(String name);
@Message(id = 129004, value = "No Connector name configured on create ConnectionFactory")
ActiveMQIllegalStateException noConnectorNameOnCF();
- @Message(id = 129005, value = "Connector ''{}'' not found on the main configuration file")
+ @Message(id = 129005, value = "Connector '{}' not found on the main configuration file")
ActiveMQIllegalStateException noConnectorNameConfiguredOnCF(String name);
@Message(id = 129006, value = "Binding {} is already being used by another connection factory")
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
index 0e8cfceea8..75f8826283 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
@@ -99,7 +99,7 @@ public interface ActiveMQJournalLogger {
@LogMessage(id = 142011, value = "Error on reading compacting for {}", level = LogMessage.Level.WARN)
void compactReadError(JournalFile file);
- @LogMessage(id = 142012, value = "Couldn''t find tx={} to merge after compacting", level = LogMessage.Level.WARN)
+ @LogMessage(id = 142012, value = "Couldn't find tx={} to merge after compacting", level = LogMessage.Level.WARN)
void compactMergeError(Long id);
@LogMessage(id = 142013, value = "Prepared transaction {} was not considered completed, it will be ignored", level = LogMessage.Level.WARN)
@@ -132,7 +132,7 @@ public interface ActiveMQJournalLogger {
@LogMessage(id = 142022, value = "Timed out on AIO poller shutdown", level = LogMessage.Level.WARN)
void timeoutOnPollerShutdown(@Cause Exception e);
- @LogMessage(id = 142023, value = "Executor on file {} couldn''t complete its tasks in 60 seconds.", level = LogMessage.Level.WARN)
+ @LogMessage(id = 142023, value = "Executor on file {} couldn't complete its tasks in 60 seconds.", level = LogMessage.Level.WARN)
void couldNotCompleteTask(@Cause Exception e, String name);
@LogMessage(id = 142024, value = "Error completing callback", level = LogMessage.Level.WARN)
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
index 05fef2d556..a5f5bf4977 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
@@ -141,10 +141,10 @@ public interface ActiveMQStompProtocolMessageBundle {
@Message(id = 339034, value = "This method should not be called")
IllegalStateException invalidCall();
- @Message(id = 339035, value = "Must specify the subscription''s id or the destination you are unsubscribing from")
+ @Message(id = 339035, value = "Must specify the subscription's id or the destination you are unsubscribing from")
ActiveMQStompException needIDorDestination();
- @Message(id = 339037, value = "Must specify the subscription''s id")
+ @Message(id = 339037, value = "Must specify the subscription's id")
ActiveMQStompException needSubscriptionID();
@Message(id = 339039, value = "No id header in ACK/NACK frame.")
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
index 30bf690082..3ae22311f8 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
@@ -53,7 +53,7 @@ public interface ActiveMQRestLogger {
@LogMessage(id = 182003, value = "Failed to build Message from object", level = LogMessage.Level.WARN)
void failedToBuildMessageFromObject(@Cause Exception e);
- @LogMessage(id = 182004, value = "REST configuration parameter ''{}'' is deprecated. Use ''{1}'' instead.", level = LogMessage.Level.WARN)
+ @LogMessage(id = 182004, value = "REST configuration parameter '{}' is deprecated. Use '{}' instead.", level = LogMessage.Level.WARN)
void deprecatedConfiguration(String oldConfigParameter, String newConfigParameter);
@LogMessage(id = 184000, value = "Failed to load push store {}, it is probably corrupted", level = LogMessage.Level.ERROR)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
index 338cb5e397..f5f75054a3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
@@ -91,8 +91,7 @@ public interface ActiveMQMessageBundle {
@Message(id = 229005, value = "connections for {} closed by management")
ActiveMQInternalErrorException connectionsClosedByManagement(String ipAddress);
- // TODO: replace now-unecessary '' escapes in messages with just ', throughout the codebase...in order to maintain prior output, and make the code seem less whack :/
- @Message(id = 229006, value = "journals are not JournalImpl. You can''t set a replicator!")
+ @Message(id = 229006, value = "journals are not JournalImpl. You can't set a replicator!")
ActiveMQInternalErrorException notJournalImpl();
@Message(id = 229007, value = "unhandled error during replication")
@@ -155,10 +154,10 @@ public interface ActiveMQMessageBundle {
@Message(id = 229027, value = "Could not find reference on consumer ID={}, messageId = {} queue = {}")
ActiveMQIllegalStateException consumerNoReference(Long id, Long messageID, SimpleString name);
- @Message(id = 229028, value = "Consumer {} doesn''t exist on the server")
+ @Message(id = 229028, value = "Consumer {} doesn't exist on the server")
ActiveMQIllegalStateException consumerDoesntExist(long consumerID);
- @Message(id = 229029, value = "No address configured on the Server''s Session")
+ @Message(id = 229029, value = "No address configured on the Server's Session")
ActiveMQIllegalStateException noAddress();
@Message(id = 229030, value = "large-message not initialized on server")
@@ -290,13 +289,13 @@ public interface ActiveMQMessageBundle {
@Message(id = 229074, value = "Error instantiating transformer class {}")
IllegalArgumentException errorCreatingTransformerClass(@Cause Exception e, String transformerClassName);
- @Message(id = 229075, value = "method autoEncode doesn''t know how to convert {} yet")
+ @Message(id = 229075, value = "method autoEncode doesn't know how to convert {} yet")
IllegalArgumentException autoConvertError(Class<? extends Object> aClass);
/**
* Message used on on {@link org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl#destroyConnectionWithSessionMetadata(String, String)}
*/
- @Message(id = 229076, value = "Executing destroyConnection with {}={} through management''s request")
+ @Message(id = 229076, value = "Executing destroyConnection with {}={} through management's request")
String destroyConnectionWithSessionMetadataHeader(String key, String value);
/**
@@ -308,7 +307,7 @@ public interface ActiveMQMessageBundle {
/**
* Exception used on on {@link org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl#destroyConnectionWithSessionMetadata(String, String)}
*/
- @Message(id = 229078, value = "Disconnected per admin''s request on {}={}")
+ @Message(id = 229078, value = "Disconnected per admin's request on {}={}")
ActiveMQDisconnectedException destroyConnectionWithSessionMetadataSendException(String key, String value);
/**
@@ -360,10 +359,10 @@ public interface ActiveMQMessageBundle {
@Message(id = 229109, value = "unsupported HA Policy Configuration {}")
ActiveMQIllegalStateException unsupportedHAPolicyConfiguration(Object o);
- @Message(id = 229110, value = "Too many sessions for user ''{}''. Sessions allowed: {}.")
+ @Message(id = 229110, value = "Too many sessions for user '{}'. Sessions allowed: {}.")
ActiveMQSessionCreationException sessionLimitReached(String username, int limit);
- @Message(id = 229111, value = "Too many queues created by user ''{}''. Queues allowed: {}.")
+ @Message(id = 229111, value = "Too many queues created by user '{}'. Queues allowed: {}.")
ActiveMQSecurityException queueLimitReached(String username, int limit);
@Message(id = 229112, value = "Cannot set MBeanServer during startup or while started")
@@ -375,7 +374,7 @@ public interface ActiveMQMessageBundle {
@Message(id = 229114, value = "Replication synchronization process timed out after waiting {} milliseconds")
ActiveMQReplicationTimeooutException replicationSynchronizationTimeout(long timeout);
- @Message(id = 229115, value = "Colocated Policy hasn''t different type live and backup")
+ @Message(id = 229115, value = "Colocated Policy hasn't different type live and backup")
ActiveMQIllegalStateException liveBackupMismatch();
@Message(id = 229116, value = "Netty Acceptor unavailable")
@@ -422,13 +421,13 @@ public interface ActiveMQMessageBundle {
@Message(id = 229208, value = "Invalid routing type {}")
IllegalArgumentException invalidRoutingType(String val);
- @Message(id = 229209, value = "Can''t remove routing type {}, queues exists for address: {}. Please delete queues before removing this routing type.")
+ @Message(id = 229209, value = "Can't remove routing type {}, queues exists for address: {}. Please delete queues before removing this routing type.")
IllegalStateException invalidRoutingTypeDelete(RoutingType routingType, String address);
- @Message(id = 229210, value = "Can''t update queue {} with maxConsumers: {}. Current consumers are {}.")
+ @Message(id = 229210, value = "Can't update queue {} with maxConsumers: {}. Current consumers are {}.")
IllegalStateException invalidMaxConsumersUpdate(String queueName, int maxConsumers, int consumers);
- @Message(id = 229211, value = "Can''t update queue {} with routing type: {}, Supported routing types for address: {} are {}")
+ @Message(id = 229211, value = "Can't update queue {} with routing type: {}, Supported routing types for address: {} are {}")
IllegalStateException invalidRoutingTypeUpdate(String queueName,
RoutingType routingType,
String address,
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 2aca599e5e..bc2ed282ac 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
@@ -195,10 +195,10 @@ public interface ActiveMQServerLogger {
SimpleString address,
SimpleString simpleString);
- @LogMessage(id = 221037, value = "{} to become ''live''", level = LogMessage.Level.INFO)
+ @LogMessage(id = 221037, value = "{} to become 'live'", level = LogMessage.Level.INFO)
void becomingLive(ActiveMQServer server);
- @LogMessage(id = 221038, value = "Configuration option ''{}'' is deprecated. Consult the manual for details.", level = LogMessage.Level.INFO)
+ @LogMessage(id = 221038, value = "Configuration option '{}' is deprecated. Consult the manual for details.", level = LogMessage.Level.INFO)
void deprecatedConfigurationOption(String deprecatedOption);
@LogMessage(id = 221039, value = "Restarting as Replicating backup server after live restart", level = LogMessage.Level.INFO)
@@ -219,13 +219,13 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 221045, value = "libaio is not available, switching the configuration into NIO", level = LogMessage.Level.INFO)
void switchingNIO();
- @LogMessage(id = 221046, value = "Unblocking message production on address ''{}''; {}", level = LogMessage.Level.INFO)
+ @LogMessage(id = 221046, value = "Unblocking message production on address '{}'; {}", level = LogMessage.Level.INFO)
void unblockingMessageProduction(SimpleString addressName, String sizeInfo);
@LogMessage(id = 221047, value = "Backup Server has scaled down to live server", level = LogMessage.Level.INFO)
void backupServerScaledDown();
- @LogMessage(id = 221048, value = "Consumer {}:{} attached to queue ''{}'' from {} identified as ''slow.'' Expected consumption rate: {} msgs/second; actual consumption rate: {} msgs/second.", level = LogMessage.Level.INFO)
+ @LogMessage(id = 221048, value = "Consumer {}:{} attached to queue '{}' from {} identified as 'slow.' Expected consumption rate: {} msgs/second; actual consumption rate: {} msgs/second.", level = LogMessage.Level.INFO)
void slowConsumerDetected(String sessionID,
long consumerID,
String queueName,
@@ -245,7 +245,7 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 221052, value = "Deploying topic {}", level = LogMessage.Level.INFO)
void deployTopic(SimpleString topicName);
- @LogMessage(id = 221053, value = "Disallowing use of vulnerable protocol ''{}'' on acceptor ''{}''. See http://www.oracle.com/technetwork/topics/security/poodlecve-2014-3566-2339408.html for more details.", level = LogMessage.Level.INFO)
+ @LogMessage(id = 221053, value = "Disallowing use of vulnerable protocol '{}' on acceptor '{}'. See http://www.oracle.com/technetwork/topics/security/poodlecve-2014-3566-2339408.html for more details.", level = LogMessage.Level.INFO)
void disallowedProtocol(String protocol, String acceptorName);
@LogMessage(id = 221054, value = "libaio was found but the filesystem does not support AIO. Switching the configuration into NIO. Journal path: {}", level = LogMessage.Level.INFO)
@@ -401,7 +401,7 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 222019, value = "There is already a discovery group with name {} deployed. This one will not be deployed.", level = LogMessage.Level.WARN)
void discoveryGroupAlreadyDeployed(String name);
- @LogMessage(id = 222020, value = "error scanning for URL''s", level = LogMessage.Level.WARN)
+ @LogMessage(id = 222020, value = "error scanning for URL's", level = LogMessage.Level.WARN)
void errorScanningURLs(@Cause Exception e);
@LogMessage(id = 222021, value = "problem undeploying {}", level = LogMessage.Level.WARN)
@@ -455,10 +455,10 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 222037, value = "IO Error, impossible to start paging", level = LogMessage.Level.WARN)
void pageStoreStartIOError(@Cause Exception e);
- @LogMessage(id = 222038, value = "Starting paging on address ''{}''; {}", level = LogMessage.Level.INFO)
+ @LogMessage(id = 222038, value = "Starting paging on address '{}'; {}", level = LogMessage.Level.INFO)
void pageStoreStart(SimpleString storeName, String sizeInfo);
- @LogMessage(id = 222039, value = "Messages sent to address ''{}'' are being dropped; {}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 222039, value = "Messages sent to address '{}' are being dropped; {}", level = LogMessage.Level.WARN)
void pageStoreDropMessages(SimpleString storeName, String sizeInfo);
@LogMessage(id = 222040, value = "Server is stopped", level = LogMessage.Level.WARN)
@@ -828,13 +828,13 @@ public interface ActiveMQServerLogger {
void groupingQueueRemoved(int size, SimpleString clusterName);
@SuppressWarnings("deprecation")
- @LogMessage(id = 222168, value = "The ''" + TransportConstants.PROTOCOL_PROP_NAME + "'' property is deprecated. If you want this Acceptor to support multiple protocols, use the ''" + TransportConstants.PROTOCOLS_PROP_NAME + "'' property, e.g. with value ''CORE,AMQP,STOMP''", level = LogMessage.Level.WARN)
+ @LogMessage(id = 222168, value = "The '" + TransportConstants.PROTOCOL_PROP_NAME + "' property is deprecated. If you want this Acceptor to support multiple protocols, use the '" + TransportConstants.PROTOCOLS_PROP_NAME + "' property, e.g. with value 'CORE,AMQP,STOMP'", level = LogMessage.Level.WARN)
void warnDeprecatedProtocol();
- @LogMessage(id = 222169, value = "You have old legacy clients connected to the queue {} and we can''t disconnect them, these clients may just hang", level = LogMessage.Level.WARN)
+ @LogMessage(id = 222169, value = "You have old legacy clients connected to the queue {} and we can't disconnect them, these clients may just hang", level = LogMessage.Level.WARN)
void warnDisconnectOldClient(String queueName);
- @LogMessage(id = 222170, value = "Bridge {} forwarding address {} has confirmation-window-size ({}) greater than address'' max-size-bytes'' ({})", level = LogMessage.Level.WARN)
+ @LogMessage(id = 222170, value = "Bridge {} forwarding address {} has confirmation-window-size ({}) greater than address' max-size-bytes' ({})", level = LogMessage.Level.WARN)
void bridgeConfirmationWindowTooSmall(String bridgeName, String address, int windowConfirmation, long maxSizeBytes);
@LogMessage(id = 222171, value = "Bridge {} forwarding address {} could not be resolved on address-settings configuration", level = LogMessage.Level.WARN)
@@ -867,7 +867,7 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 222182, value = "Missing cluster-configuration for scale-down-clustername {}", level = LogMessage.Level.WARN)
void missingClusterConfigForScaleDown(String scaleDownCluster);
- @LogMessage(id = 222183, value = "Blocking message production on address ''{}''; {}", level = LogMessage.Level.WARN)
+ @LogMessage(id = 222183, value = "Blocking message production on address '{}'; {}", level = LogMessage.Level.WARN)
void blockingMessageProduction(SimpleString addressName, String pageInfo);
@LogMessage(id = 222184, value = "Unable to recover group bindings in SCALE_DOWN mode, only FULL backup server can do this", level = LogMessage.Level.WARN)
@@ -900,7 +900,7 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 222194, value = "PageCursorInfo == null on address {}, pos = {}, queue = {}.", level = LogMessage.Level.WARN)
void nullPageCursorInfo(String address, String position, long id);
- @LogMessage(id = 222195, value = "Large message {} wasn''t found when dealing with add pending large message", level = LogMessage.Level.WARN)
+ @LogMessage(id = 222195, value = "Large message {} wasn't found when dealing with add pending large message", level = LogMessage.Level.WARN)
void largeMessageNotFound(long id);
@LogMessage(id = 222196, value = "Could not find binding with id={} on routeFromCluster for message={} binding = {}", level = LogMessage.Level.WARN)
@@ -954,7 +954,7 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 222211, value = "Free storage space is at {} of {} total. Usage rate is {} which is below the configured <max-disk-usage>.", level = LogMessage.Level.INFO)
void diskCapacityRestored(String usableSpace, String totalSpace, String usage);
- @LogMessage(id = 222212, value = "Disk Full! Blocking message production on address ''{}''. Clients will report blocked.", level = LogMessage.Level.WARN)
+ @LogMessage(id = 222212, value = "Disk Full! Blocking message production on address '{}'. Clients will report blocked.", level = LogMessage.Level.WARN)
void blockingDiskFull(SimpleString addressName);
@LogMessage(id = 222213, value = "There was an issue on the network, server is isolated!", level = LogMessage.Level.WARN)
@@ -1546,7 +1546,7 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 224107, value = "The Critical Analyzer detected slow paths on the broker. It is recommended that you enable trace logs on org.apache.activemq.artemis.utils.critical while you troubleshoot this issue. You should disable the trace logs when you have finished troubleshooting.", level = LogMessage.Level.INFO)
void enableTraceForCriticalAnalyzer();
- @LogMessage(id = 224108, value = "Stopped paging on address ''{}''; {}", level = LogMessage.Level.INFO)
+ @LogMessage(id = 224108, value = "Stopped paging on address '{}'; {}", level = LogMessage.Level.INFO)
void pageStoreStop(SimpleString storeName, String pageInfo);
@LogMessage(id = 224109, value = "ConnectionRouter {} not found", level = LogMessage.Level.WARN)
@@ -1564,10 +1564,10 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 224113, value = "Auto removing Address {}", level = LogMessage.Level.INFO)
void autoRemoveAddress(String name);
- @LogMessage(id = 224114, value = "Address control block, blocking message production on address ''{}''. Clients will not get further credit.", level = LogMessage.Level.INFO)
+ @LogMessage(id = 224114, value = "Address control block, blocking message production on address '{}'. Clients will not get further credit.", level = LogMessage.Level.INFO)
void blockingViaControl(SimpleString addressName);
- @LogMessage(id = 224115, value = "Address control unblock of address ''{}''. Clients will be granted credit as normal.", level = LogMessage.Level.INFO)
+ @LogMessage(id = 224115, value = "Address control unblock of address '{}'. Clients will be granted credit as normal.", level = LogMessage.Level.INFO)
void unblockingViaControl(SimpleString addressName);
@LogMessage(id = 224116, value = "The component {} is not responsive during start up. The Server may be taking too long to start", level = LogMessage.Level.WARN)
[activemq-artemis] 35/42: reset smoke test config to current base assembly config
Posted by cl...@apache.org.
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 019bd4c2eae8d7a6bcb5f9a46026b8c8219ad659
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 11:22:37 2022 +0100
reset smoke test config to current base assembly config
---
.../servers/audit-logging/log4j2-config.properties | 58 ++++++++++++++++------
1 file changed, 43 insertions(+), 15 deletions(-)
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
index 7084e749ef..8a32c0ad47 100644
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
@@ -14,48 +14,76 @@
# limitations under the License.
# Log4J 2 configuration
-rootLogger = INFO, Console
+
+rootLogger = INFO, console, log_file
logger.activemq.name=org.apache.activemq
logger.activemq.level=INFO
+logger.artemis_server.name=org.apache.activemq.artemis.core.server
+logger.artemis_server.level=INFO
+
+logger.artemis_journal.name=org.apache.activemq.artemis.journal
+logger.artemis_journal.level=INFO
+
+logger.artemis_utils.name=org.apache.activemq.artemis.utils
+logger.artemis_utils.level=INFO
+
+# CriticalAnalyzer: If you have issues with the CriticalAnalyzer, setting this to TRACE would give
+# you extra troubleshooting info, but do not use TRACE regularly as it would incur extra CPU usage.
+logger.critical_analyzer.name=org.apache.activemq.artemis.utils.critical
+logger.critical_analyzer.level=INFO
+
# Audit loggers: to enable change levels from OFF to INFO
-logger.audit_base = INFO, audit_log_file
+logger.audit_base = OFF, audit_log_file
logger.audit_base.name = org.apache.activemq.audit.base
logger.audit_base.additivity = false
-logger.audit_resource = INFO, audit_log_file
+logger.audit_resource = OFF, audit_log_file
logger.audit_resource.name = org.apache.activemq.audit.resource
logger.audit_resource.additivity = false
-logger.audit_message = INFO, audit_log_file
+logger.audit_message = OFF, audit_log_file
logger.audit_message.name = org.apache.activemq.audit.message
logger.audit_message.additivity = false
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
-# quorum logger levels
+# Quorum related logger levels
logger.curator.name=org.apache.curator
logger.curator.level=WARN
logger.zookeeper.name=org.apache.zookeeper
logger.zookeeper.level=ERROR
+
# Console appender
appender.console.type=Console
-appender.console.name=Console
+appender.console.name=console
appender.console.layout.type=PatternLayout
-#TODO: look at old/previous pattern and align
-appender.console.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
+
+# Log file appender
+appender.log_file.type = RollingFile
+appender.log_file.name = log_file
+appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
+appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
+appender.log_file.layout.type = PatternLayout
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%n
+appender.log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
# Audit log file appender
appender.audit_log_file.type = RollingFile
appender.audit_log_file.name = audit_log_file
appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
-#TODO: look at old/previous filename pattern and behaviour and align
-appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit-%d{yyyy-MM-dd}.log
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
appender.audit_log_file.layout.type = PatternLayout
-appender.audit_log_file.layout.pattern = [%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
-#TODO: look at old/previous pattern and align
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
appender.audit_log_file.policies.type = Policies
-appender.audit_log_file.policies.time.type = TimeBasedTriggeringPolicy
-appender.audit_log_file.policies.time.interval = 24
-appender.audit_log_file.policies.time.modulate = true
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
[activemq-artemis] 25/42: flesh out assembly default logging config, give output like previous behaviour
Posted by cl...@apache.org.
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 9f7c1024ebacc14898062934c1f54110e0710d62
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Jul 20 14:06:16 2022 +0100
flesh out assembly default logging config, give output like previous behaviour
---
.../cli/commands/etc/log4j2-config.properties | 37 +++++++++++++++-------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
index bebb6d4b9d..e7c4bb41b1 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
@@ -14,7 +14,7 @@
# limitations under the License.
# Log4J 2 configuration
-rootLogger = INFO, Console
+rootLogger = INFO, console, log_file
logger.activemq.name=org.apache.activemq
logger.activemq.level=INFO
@@ -32,30 +32,43 @@ logger.audit_message = OFF, audit_log_file
logger.audit_message.name = org.apache.activemq.audit.message
logger.audit_message.additivity = false
-
# quorum logger levels
logger.curator.name=org.apache.curator
logger.curator.level=WARN
logger.zookeeper.name=org.apache.zookeeper
logger.zookeeper.level=ERROR
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
+
+
# Console appender
appender.console.type=Console
-appender.console.name=Console
+appender.console.name=console
appender.console.layout.type=PatternLayout
-#TODO: look at old/previous pattern and align
-appender.console.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
+
+# Log file appender
+appender.log_file.type = RollingFile
+appender.log_file.name = log_file
+appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
+appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
+appender.log_file.layout.type = PatternLayout
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%n
+appender.log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
# Audit log file appender
appender.audit_log_file.type = RollingFile
appender.audit_log_file.name = audit_log_file
appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
-#TODO: look at old/previous filename pattern and behaviour and align
-appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit-%d{yyyy-MM-dd}.log
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
appender.audit_log_file.layout.type = PatternLayout
-appender.audit_log_file.layout.pattern = [%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
-#TODO: look at old/previous pattern and align
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
appender.audit_log_file.policies.type = Policies
-appender.audit_log_file.policies.time.type = TimeBasedTriggeringPolicy
-appender.audit_log_file.policies.time.interval = 24
-appender.audit_log_file.policies.time.modulate = true
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
[activemq-artemis] 12/42: fix format of code prefix in messages, pointed out by failing test
Posted by cl...@apache.org.
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 86e73cd83d87e055dbf18c08b804a0275134dd69
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Jul 13 18:37:38 2022 +0100
fix format of code prefix in messages, pointed out by failing test
---
.../src/test/java/org/apache/activemq/cli/test/ArtemisTest.java | 2 +-
.../java/org/apache/activemq/artemis/logprocessor/LogProcessor.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
index eb12c8e951..984b2887d5 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
@@ -507,7 +507,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
addCmd.execute(context);
result = context.getStderr();
- assertTrue(result.contains("Failed to add user scott. Reason: AMQ229223: User scott already exists"));
+ assertTrue("Unexpected output: '" + result + "'", result.contains("Failed to add user scott. Reason: AMQ229223: User scott already exists"));
//check existing users are intact
context = new TestActionContext();
diff --git a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
index a3f80f3c29..d88d690eaa 100644
--- a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
+++ b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
@@ -240,7 +240,7 @@ public class LogProcessor extends AbstractProcessor {
writerOutput.println(")");
writerOutput.println(" {");
- String formattingString = encodeSpecialChars(bundleAnnotation.projectCode() + messageAnnotation.id() + " " + messageAnnotation.value());
+ String formattingString = encodeSpecialChars(bundleAnnotation.projectCode() + messageAnnotation.id() + ": " + messageAnnotation.value());
if (!hasParameters) {
writerOutput.println(" String returnString = \"" + formattingString + "\";");
} else {
@@ -390,7 +390,7 @@ public class LogProcessor extends AbstractProcessor {
}
//TODO: handle causes being passed in the args to be logged, but not necessarily (often not) being last arg at present as SLF4J/frameworks expect.
- String formattingString = encodeSpecialChars(bundleAnnotation.projectCode() + messageAnnotation.id() + " " + messageAnnotation.value());
+ String formattingString = encodeSpecialChars(bundleAnnotation.projectCode() + messageAnnotation.id() + ": " + messageAnnotation.value());
if (!hasParameters) {
writerOutput.println(" logger." + methodName + "(\"" + formattingString + "\");");
} else {
[activemq-artemis] 26/42: log processing improvement with exceptions
Posted by cl...@apache.org.
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 b624a4317397a0f553baa5de87c645e62c290d01
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Wed Jul 20 17:22:25 2022 -0400
log processing improvement with exceptions
---
artemis-log-processor/pom.xml | 6 ++
.../artemis/logprocessor/LogProcessor.java | 57 ++++++++++++++---
.../activemq/artemis/logprocessor/MyException.java | 3 +
.../artemis/logprocessor/SimpleBundle.java | 18 ++++++
.../artemis/logprocessor/SimpleBundleTest.java | 71 ++++++++++++++++++++++
.../artemis/logs/AssertionLoggerHandler.java | 22 +++++++
6 files changed, 167 insertions(+), 10 deletions(-)
diff --git a/artemis-log-processor/pom.xml b/artemis-log-processor/pom.xml
index 6abe8ab169..50b87d265a 100644
--- a/artemis-log-processor/pom.xml
+++ b/artemis-log-processor/pom.xml
@@ -38,6 +38,12 @@
<artifactId>artemis-log-facade</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
index d88d690eaa..2d7c7f706a 100644
--- a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
+++ b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java
@@ -32,14 +32,17 @@ import javax.lang.model.type.TypeMirror;
import javax.tools.Diagnostic;
import javax.tools.JavaFileObject;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.GetLogger;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.apache.activemq.artemis.logprocessor.annotation.Message;
+import org.slf4j.helpers.MessageFormatter;
@SupportedAnnotationTypes({"org.apache.activemq.artemis.logprocessor.annotation.LogBundle"})
@SupportedSourceVersion(SourceVersion.RELEASE_11)
@@ -351,27 +354,57 @@ public class LogProcessor extends AbstractProcessor {
writerOutput.println(" @Override");
writerOutput.write(" public void " + executableMember.getSimpleName() + "(");
- Iterator<? extends VariableElement> parameters = executableMember.getParameters().iterator();
+ List<? extends VariableElement> parametersList = executableMember.getParameters();
boolean hasParameters = false;
- // the one that will be used on the call
- StringBuffer callList = new StringBuffer();
+ VariableElement exceptionParameter = null;
+ ArrayList<VariableElement> nonExceptionParameters = new ArrayList<>();
+
+ Iterator<? extends VariableElement> parameters = parametersList.iterator();
while (parameters.hasNext()) {
hasParameters = true;
VariableElement parameter = parameters.next();
writerOutput.write(parameter.asType() + " " + parameter.getSimpleName());
- callList.append(parameter.getSimpleName());
if (parameters.hasNext()) {
writerOutput.write(", ");
- callList.append(",");
+ }
+
+ boolean isException = isException(parameter.asType(), parameter);
+
+ if (isException) {
+ if (exceptionParameter != null) {
+ throw new IllegalArgumentException("You can only have one exception defined per log message, check:: " + executableMember);
+ }
+ exceptionParameter = parameter;
+ }
+
+ if (DEBUG) {
+ debug("Parameter " + parameter + (isException? "is" : "is not") + " an exception");
+ }
+
+ if (!isException) {
+ nonExceptionParameters.add(parameter);
}
}
- // the real implementation
writerOutput.println(")");
writerOutput.println(" {");
+ // the one that will be used on the call
+ StringBuffer callList = new StringBuffer();
+ parameters = nonExceptionParameters.iterator();
+
+ while (parameters.hasNext()) {
+ hasParameters = true;
+ VariableElement parameter = parameters.next();
+ callList.append(parameter.getSimpleName());
+ if (parameters.hasNext()) {
+ callList.append(",");
+ }
+ }
+
+
String methodName;
switch (messageAnnotation.level()) {
@@ -389,12 +422,16 @@ public class LogProcessor extends AbstractProcessor {
throw new IllegalStateException("illegal method level " + messageAnnotation.level());
}
- //TODO: handle causes being passed in the args to be logged, but not necessarily (often not) being last arg at present as SLF4J/frameworks expect.
String formattingString = encodeSpecialChars(bundleAnnotation.projectCode() + messageAnnotation.id() + ": " + messageAnnotation.value());
- if (!hasParameters) {
- writerOutput.println(" logger." + methodName + "(\"" + formattingString + "\");");
+ if (exceptionParameter != null) {
+ writerOutput.println(" FormattingTuple output = org.slf4j.helpers.MessageFormatter.arrayFormat(\"" + formattingString + "\",new Object[] {" + callList + "});");
+ writerOutput.println(" logger." + methodName + "(output.getMessage(), " + exceptionParameter.getSimpleName() +");");
} else {
- writerOutput.println(" logger." + methodName + "(\"" + formattingString + "\", " + callList + ");");
+ if (!hasParameters) {
+ writerOutput.println(" logger." + methodName + "(\"" + formattingString + "\");");
+ } else {
+ writerOutput.println(" logger." + methodName + "(\"" + formattingString + "\", " + callList + ");");
+ }
}
writerOutput.println(" }");
writerOutput.println();
diff --git a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/MyException.java b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/MyException.java
index d9551c3d85..1c99e60d01 100644
--- a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/MyException.java
+++ b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/MyException.java
@@ -27,5 +27,8 @@ public class MyException extends Exception {
super(error, cause);
}
+ public String toString() {
+ return getMessage();
+ }
}
diff --git a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java
index 5826103cad..5780e13abd 100644
--- a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java
+++ b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundle.java
@@ -17,6 +17,8 @@
package org.apache.activemq.artemis.logprocessor;
+import java.io.IOException;
+
import org.apache.activemq.artemis.logprocessor.annotation.GetLogger;
import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
@@ -58,6 +60,22 @@ public interface SimpleBundle {
@Message(id = 10, value = "{} {} {} {}")
String objectsAbcd(MyObject a, MyObject b, MyObject c, MyObject d);
+ @LogMessage(id = 11, value = "This message has the following parameter:: {}", level = LogMessage.Level.WARN)
+ void parameterException(String parameter, IOException e);
+
+ @LogMessage(id = 12, value = "This message has the following parameter:: {}", level = LogMessage.Level.WARN)
+ void myExceptionLogger(String parameter, MyException e);
+
+ @LogMessage(id = 13, value = "This message has the following parameter:: p{}", level = LogMessage.Level.WARN)
+ void outOfOrder(MyException e, String parameter);
+
+ @LogMessage(id = 14, value = "OutOfOrder with 4 parameters p{} p{} p{}", level = LogMessage.Level.WARN)
+ void outOfOrder(MyException p1, String p2, String p3, String p4);
+
+ @LogMessage(id = 15, value = "Long with 5 parameters p{} p{} p{} p{} p{}", level = LogMessage.Level.WARN)
+ void longParameters(String p1, String p2, String p3, String p4, String p5);
+
+
@GetLogger
Logger getLogger();
}
diff --git a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
index 424538da4c..8cc3cc5ddb 100644
--- a/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
+++ b/artemis-log-processor/src/test/java/org/apache/activemq/artemis/logprocessor/SimpleBundleTest.java
@@ -17,10 +17,12 @@
package org.apache.activemq.artemis.logprocessor;
+import java.io.IOException;
import java.util.UUID;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
public class SimpleBundleTest {
@@ -83,6 +85,75 @@ public class SimpleBundleTest {
}
+ @Test
+ public void exceptions() {
+ SimpleBundle.MESSAGES.parameterException("hello", new IOException("this is an exception"));
+ SimpleBundle.MESSAGES.myExceptionLogger("hello2", new MyException("this is an exception"));
+ }
+
+ @Test
+ public void outOfOrderException() {
+ AssertionLoggerHandler.startCapture(false, true);
+ try {
+ SimpleBundle.MESSAGES.outOfOrder(createMyException("NotHere"), "2");
+ Assert.assertTrue("parameter2 was not on the output", AssertionLoggerHandler.findText("p2"));
+ Assert.assertFalse(AssertionLoggerHandler.findText("pNotHere"));
+ Assert.assertTrue("Stack trace was not printed", AssertionLoggerHandler.findText("createMyException"));
+ Assert.assertFalse("logging not working", AssertionLoggerHandler.findText("{}"));
+ } finally {
+ AssertionLoggerHandler.stopCapture();
+ }
+ }
+
+ @Test
+ public void outOfOrderExceptionLongParameter() {
+ try {
+ AssertionLoggerHandler.startCapture(false, false);
+ SimpleBundle.MESSAGES.outOfOrder(new MyException("ex1"), "2", "3", "4");
+ Assert.assertFalse("parameter not found", AssertionLoggerHandler.findText("pex1"));
+ Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p2"));
+ Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p3"));
+ Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p4"));
+ Assert.assertFalse("formatting not working", AssertionLoggerHandler.findText("{}"));
+
+ AssertionLoggerHandler.clear();
+ AssertionLoggerHandler.startCapture(false, true);
+
+ SimpleBundle.MESSAGES.outOfOrder(createMyException("ex1"), "2", "3", "4");
+ Assert.assertFalse("parameter not found", AssertionLoggerHandler.findText("pex1"));
+ Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p3"));
+ Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p4"));
+ Assert.assertTrue("stack not found", AssertionLoggerHandler.findText("createMyException"));
+ Assert.assertFalse("formatting not working", AssertionLoggerHandler.findText("{}"));
+
+ } finally {
+ AssertionLoggerHandler.stopCapture();
+ }
+ }
+
+ @Test
+ public void longList() {
+ AssertionLoggerHandler.startCapture(false, true);
+ try {
+ SimpleBundle.MESSAGES.longParameters("1", "2", "3", "4", "5");
+ Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p1"));
+ Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p2"));
+ Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p3"));
+ Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p4"));
+ Assert.assertTrue("parameter not found", AssertionLoggerHandler.findText("p5"));
+ Assert.assertFalse("{}", AssertionLoggerHandler.findText("{}"));
+ } finally {
+ AssertionLoggerHandler.stopCapture();
+ }
+ }
+
+
+ // I'm doing it on a method just to assert if this method will appear on the stack trace
+ private MyException createMyException(String message) {
+ return new MyException(message);
+ }
+
+
@Test
public void testGetLogger() {
Assert.assertNotNull(SimpleBundle.MESSAGES.getLogger());
diff --git a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
index 269745e4d5..224f016e6a 100644
--- a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
+++ b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
@@ -16,7 +16,9 @@
*/
package org.apache.activemq.artemis.logs;
+import java.io.PrintWriter;
import java.io.Serializable;
+import java.io.StringWriter;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -45,6 +47,8 @@ public class AssertionLoggerHandler extends AbstractAppender {
private static final Map<String, LogEvent> messages = new ConcurrentHashMap<>();
private static List<String> traceMessages;
private static volatile boolean capture = false;
+ private static volatile boolean captureStackTrace = false;
+
public static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B> implements org.apache.logging.log4j.core.util.Builder<AssertionLoggerHandler> {
@Override
@@ -67,7 +71,15 @@ public class AssertionLoggerHandler extends AbstractAppender {
if (capture) {
//TODO: see getFormattedMessage() around handling StringBuilderFormattable interface as well, check it out
String formattedMessage = event.getMessage().getFormattedMessage();
+
+ if (captureStackTrace && event.getThrown() != null) {
+ StringWriter stackOutput = new StringWriter();
+ event.getThrown().printStackTrace(new PrintWriter(stackOutput));
+ formattedMessage += stackOutput.toString();
+ }
+
messages.put(formattedMessage, event);
+
if (traceMessages != null) {
traceMessages.add(formattedMessage);
}
@@ -207,15 +219,25 @@ public class AssertionLoggerHandler extends AbstractAppender {
* @param individualMessages enables counting individual messages.
*/
public static final void startCapture(boolean individualMessages) {
+ startCapture(individualMessages, captureStackTrace);
+ }
+
+ /**
+ *
+ * @param individualMessages enables counting individual messages.
+ */
+ public static final void startCapture(boolean individualMessages, boolean captureStackTrace) {
clear();
if (individualMessages) {
traceMessages = new LinkedList<>();
}
capture = true;
+ AssertionLoggerHandler.captureStackTrace = captureStackTrace;
}
public static final void stopCapture() {
capture = false;
+ captureStackTrace = false;
clear();
traceMessages = null;
}
[activemq-artemis] 36/42: apply needed change only, and remove old unused logging.properties file
Posted by cl...@apache.org.
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 f96af1b43e042ae96cba428d381e5eb608358a9b
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 11:45:42 2022 +0100
apply needed change only, and remove old unused logging.properties file
---
.../servers/audit-logging/log4j2-config.properties | 3 +-
.../servers/audit-logging/logging.properties | 80 ----------------------
2 files changed, 2 insertions(+), 81 deletions(-)
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
index 8a32c0ad47..01798024a2 100644
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# NOTE: Enabled resource audit log for this smoke test
# Log4J 2 configuration
rootLogger = INFO, console, log_file
@@ -39,7 +40,7 @@ logger.audit_base = OFF, audit_log_file
logger.audit_base.name = org.apache.activemq.audit.base
logger.audit_base.additivity = false
-logger.audit_resource = OFF, audit_log_file
+logger.audit_resource = INFO, audit_log_file
logger.audit_resource.name = org.apache.activemq.audit.resource
logger.audit_resource.additivity = false
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging/logging.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging/logging.properties
deleted file mode 100644
index 3063e38fd5..0000000000
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging/logging.properties
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# 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=ERROR
-logger.org.apache.activemq.audit.base.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.base.useParentHandlers=false
-
-logger.org.apache.activemq.audit.message.level=ERROR
-logger.org.apache.activemq.audit.message.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.message.useParentHandlers=
-
-logger.org.apache.activemq.audit.resource.level=INFO
-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=INFO
-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
[activemq-artemis] 24/42: Removing Reload4J
Posted by cl...@apache.org.
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 a67f4ef487f680710bf816133a73a10b976a946c
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue Jul 19 11:31:58 2022 -0400
Removing Reload4J
---
tests/activemq5-unit-tests/pom.xml | 18 +++--
.../activemq/ReconnectWithSameClientIDTest.java | 23 ++----
.../activemq/transport/failover/AMQ1925Test.java | 7 +-
.../transport/failover/FailoverUpdateURIsTest.java | 13 ++--
.../apache/activemq/util/DefaultTestAppender.java | 83 ----------------------
5 files changed, 30 insertions(+), 114 deletions(-)
diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index ba3ef93c83..0aff5de5d1 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -38,12 +38,22 @@
<artifactId>mockito-core</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java
index 0a2d52bfd4..b3aeb7347e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java
@@ -25,9 +25,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import junit.framework.Test;
-import org.apache.activemq.util.DefaultTestAppender;
-import org.apache.log4j.Appender;
-import org.apache.log4j.spi.LoggingEvent;
+import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
+import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,20 +48,8 @@ public class ReconnectWithSameClientIDTest extends EmbeddedBrokerTestSupport {
}
public void testReconnectMultipleTimesWithSameClientID() throws Exception {
+ AssertionLoggerHandler.startCapture();
- org.apache.log4j.Logger log4jLogger = org.apache.log4j.Logger.getLogger(org.apache.activemq.broker.jmx.ManagedTransportConnection.class);
- final AtomicBoolean failed = new AtomicBoolean(false);
-
- Appender appender = new DefaultTestAppender() {
- @Override
- public void doAppend(LoggingEvent event) {
- if (event.getMessage().toString().startsWith("Failed to register MBean")) {
- LOG.info("received unexpected log message: " + event.getMessage());
- failed.set(true);
- }
- }
- };
- log4jLogger.addAppender(appender);
try {
connection = connectionFactory.createConnection();
useConnection(connection);
@@ -85,10 +72,10 @@ public class ReconnectWithSameClientIDTest extends EmbeddedBrokerTestSupport {
connection.close();
connection = connectionFactory.createConnection();
useConnection(connection);
+ Assert.assertFalse(AssertionLoggerHandler.findText("Failed to register MBean"));
} finally {
- log4jLogger.removeAppender(appender);
+ AssertionLoggerHandler.stopCapture();
}
- assertFalse("failed on unexpected log event", failed.get());
}
@Override
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
index 2f9de01097..c82e59609b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
@@ -40,18 +40,19 @@ import org.apache.activemq.artemis.core.server.impl.QueueImpl;
import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
import org.apache.activemq.broker.artemiswrapper.OpenwireArtemisBaseTest;
-import org.apache.log4j.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* TestCase showing the message-destroying described in AMQ-1925
*/
public class AMQ1925Test extends OpenwireArtemisBaseTest implements ExceptionListener {
- private static final Logger log = Logger.getLogger(AMQ1925Test.class);
+ private static final Logger log = LoggerFactory.getLogger(AMQ1925Test.class);
private static final String QUEUE_NAME = "test.amq1925";
private static final String PROPERTY_MSG_NUMBER = "NUMBER";
@@ -207,7 +208,7 @@ public class AMQ1925Test extends OpenwireArtemisBaseTest implements ExceptionLis
bs = null;
}
} catch (Exception e) {
- log.error(e);
+ log.error(e.getMessage(), e);
}
}
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverUpdateURIsTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverUpdateURIsTest.java
index a8d0eebe14..0ef32ccedd 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverUpdateURIsTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverUpdateURIsTest.java
@@ -33,15 +33,16 @@ import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
import org.apache.activemq.broker.artemiswrapper.OpenwireArtemisBaseTest;
-import org.apache.log4j.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FailoverUpdateURIsTest extends OpenwireArtemisBaseTest {
private static final String QUEUE_NAME = "test.failoverupdateuris";
- private static final Logger LOG = Logger.getLogger(FailoverUpdateURIsTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FailoverUpdateURIsTest.class);
String firstTcpUri = newURI(0);
String secondTcpUri = newURI(10);
@@ -68,10 +69,10 @@ public class FailoverUpdateURIsTest extends OpenwireArtemisBaseTest {
String targetDir = "target/testUpdateURIsViaFile";
new File(targetDir).mkdir();
File updateFile = new File(targetDir + "/updateURIsFile.txt");
- LOG.info(updateFile);
- LOG.info(updateFile.toURI());
- LOG.info(updateFile.getAbsoluteFile());
- LOG.info(updateFile.getAbsoluteFile().toURI());
+ LOG.info(updateFile.toString());
+ LOG.info("" + updateFile.toURI());
+ LOG.info("" + updateFile.getAbsoluteFile());
+ LOG.info("" + updateFile.getAbsoluteFile().toURI());
FileOutputStream out = new FileOutputStream(updateFile);
out.write(firstTcpUri.getBytes());
out.close();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/DefaultTestAppender.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/DefaultTestAppender.java
deleted file mode 100644
index 241b09eddb..0000000000
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/DefaultTestAppender.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * 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.util;
-
-import org.apache.log4j.Appender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.spi.ErrorHandler;
-import org.apache.log4j.spi.Filter;
-
-public abstract class DefaultTestAppender implements Appender {
-
- String name = this.getClass().getSimpleName();
-
- @Override
- public void addFilter(Filter newFilter) {
-
- }
-
- @Override
- public Filter getFilter() {
- return null;
- }
-
- @Override
- public void clearFilters() {
-
- }
-
- @Override
- public void close() {
-
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setErrorHandler(ErrorHandler errorHandler) {
-
- }
-
- @Override
- public ErrorHandler getErrorHandler() {
- return null;
- }
-
- @Override
- public void setLayout(Layout layout) {
-
- }
-
- @Override
- public Layout getLayout() {
- return null;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public boolean requiresLayout() {
- return false;
- }
-}
[activemq-artemis] 40/42: add log config for AuditLoggerAMQPMutualSSLTest
Posted by cl...@apache.org.
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 f3a3500bc33186d7b58e10e9948e1136787267f3
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 17:15:56 2022 +0100
add log config for AuditLoggerAMQPMutualSSLTest
---
.../log4j2-config.properties | 90 ++++++++++++++++++++++
.../logging.properties | 80 -------------------
2 files changed, 90 insertions(+), 80 deletions(-)
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/log4j2-config.properties
new file mode 100644
index 0000000000..33f51bcc7d
--- /dev/null
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/log4j2-config.properties
@@ -0,0 +1,90 @@
+# 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.
+
+# NOTE: Enabled base, resource and message audit log for this smoke test
+# Log4J 2 configuration
+
+rootLogger = INFO, console, log_file
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+logger.artemis_server.name=org.apache.activemq.artemis.core.server
+logger.artemis_server.level=INFO
+
+logger.artemis_journal.name=org.apache.activemq.artemis.journal
+logger.artemis_journal.level=INFO
+
+logger.artemis_utils.name=org.apache.activemq.artemis.utils
+logger.artemis_utils.level=INFO
+
+# CriticalAnalyzer: If you have issues with the CriticalAnalyzer, setting this to TRACE would give
+# you extra troubleshooting info, but do not use TRACE regularly as it would incur extra CPU usage.
+logger.critical_analyzer.name=org.apache.activemq.artemis.utils.critical
+logger.critical_analyzer.level=INFO
+
+# Audit loggers: to enable change levels from OFF to INFO
+logger.audit_base = INFO, audit_log_file
+logger.audit_base.name = org.apache.activemq.audit.base
+logger.audit_base.additivity = false
+
+logger.audit_resource = INFO, audit_log_file
+logger.audit_resource.name = org.apache.activemq.audit.resource
+logger.audit_resource.additivity = false
+
+logger.audit_message = INFO, audit_log_file
+logger.audit_message.name = org.apache.activemq.audit.message
+logger.audit_message.additivity = false
+
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
+
+# Quorum related logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=ERROR
+
+
+# Console appender
+appender.console.type=Console
+appender.console.name=console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
+
+# Log file appender
+appender.log_file.type = RollingFile
+appender.log_file.name = log_file
+appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
+appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
+appender.log_file.layout.type = PatternLayout
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%n
+appender.log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
+
+# Audit log file appender
+appender.audit_log_file.type = RollingFile
+appender.audit_log_file.name = audit_log_file
+appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
+appender.audit_log_file.layout.type = PatternLayout
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
+appender.audit_log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
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
deleted file mode 100644
index 7e0d9ca10e..0000000000
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/logging.properties
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# 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
[activemq-artemis] 41/42: simplify test logging config again, adjust assertion to be more specific and take into account change in output from 07329118c10d14bce018a580b0dadbcf081233a8
Posted by cl...@apache.org.
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 654d50b8b2214f458024c2383b092e6ccb682221
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 17:27:27 2022 +0100
simplify test logging config again, adjust assertion to be more specific and take into account change in output from 07329118c10d14bce018a580b0dadbcf081233a8
---
.../main/resources/servers/audit-logging2/log4j2-config.properties | 6 +++---
.../activemq/artemis/tests/smoke/logging/AuditLoggerTest.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties
index 5c8c6cbc74..690d09ae39 100644
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties
@@ -63,7 +63,7 @@ logger.zookeeper.level=ERROR
appender.console.type=Console
appender.console.name=console
appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=%d %-5level [%logger] %msg%notEmpty{:%xEx}%n%ex{0}
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
# Log file appender
appender.log_file.type = RollingFile
@@ -71,7 +71,7 @@ appender.log_file.name = log_file
appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
appender.log_file.layout.type = PatternLayout
-appender.log_file.layout.pattern = %d %-5level [%logger] %msg%notEmpty{:%xEx}%n%ex{0}
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%n
appender.log_file.policies.type = Policies
appender.log_file.policies.cron.type = CronTriggeringPolicy
appender.log_file.policies.cron.schedule = 0 0 0 * * ?
@@ -83,7 +83,7 @@ appender.audit_log_file.name = audit_log_file
appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
appender.audit_log_file.layout.type = PatternLayout
-appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%notEmpty{:%xEx}%n%ex{0}
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
appender.audit_log_file.policies.type = Policies
appender.log_file.policies.cron.type = CronTriggeringPolicy
appender.log_file.policies.cron.schedule = 0 0 0 * * ?
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 820c2acafb..3eb1b79109 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
@@ -112,7 +112,7 @@ public class AuditLoggerTest extends AuditLoggerTestBase {
//ignore
}
- checkAuditLogRecord(true, "gets security check failure:", "guest does not have permission='DELETE_NON_DURABLE_QUEUE'");
+ checkAuditLogRecord(true, "AMQ601264: User guest", "gets security check failure, reason = AMQ229213: User: guest does not have permission='DELETE_NON_DURABLE_QUEUE'");
//hot patch not in log
checkAuditLogRecord(true, "is sending a message");
}
[activemq-artemis] 17/42: re-enable GHA CI runs in the main repo, build now in state it can pass the PR test subset (except for d153efde4e04703875c92fdcb45f9f65b87a215b needing reverted which would make it fail)
Posted by cl...@apache.org.
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 fe017feaf4cec6fd02472c62d0b97936eacda6b4
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jul 14 17:31:42 2022 +0100
re-enable GHA CI runs in the main repo, build now in state it can pass the PR test subset (except for d153efde4e04703875c92fdcb45f9f65b87a215b needing reverted which would make it fail)
Travis build is still disabled, will restore it later
---
.github/workflows/build.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3255c23d16..40b35843f0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,6 @@ on: [push, pull_request, workflow_dispatch]
jobs:
test:
- if: github.repository != 'apache/activemq-artemis' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
name: Test (${{ matrix.java }})
runs-on: ubuntu-20.04
strategy:
@@ -44,7 +43,6 @@ jobs:
if [ -d ~/.m2/repository/org/apache/activemq ]; then find ~/.m2/repository/org/apache/activemq -name "*-SNAPSHOT" -type d -prune -exec rm -r '{}' \; ; fi
checks:
- if: github.repository != 'apache/activemq-artemis' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
name: Checks (${{ matrix.java }})
runs-on: ubuntu-20.04
strategy:
[activemq-artemis] 02/42: Artemis native at 2.0 snapshot
Posted by cl...@apache.org.
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 18a7bba02f24f6d657d0816ecafda0f1e39394f0
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Jul 11 12:58:19 2022 -0400
Artemis native at 2.0 snapshot
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d361ec439e..6db78e33fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<logging.config>logging.properties</logging.config>
<modular.jdk.surefire.arg>--add-modules java.sql,jdk.unsupported </modular.jdk.surefire.arg>
- <activemq-artemis-native-version>1.1.0-SNAPSHOT</activemq-artemis-native-version>
+ <activemq-artemis-native-version>2.0.0-SNAPSHOT</activemq-artemis-native-version>
<karaf.version>4.3.3</karaf.version>
<pax.exam.version>4.13.4</pax.exam.version>
<commons.config.version>2.8.0</commons.config.version>
[activemq-artemis] 37/42: add some [in-flux] config to get more failing audit log smoke tests passing
Posted by cl...@apache.org.
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 b3f1316ce64aae3208c681dca4dbd4f2cd12b135
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 15:27:54 2022 +0100
add some [in-flux] config to get more failing audit log smoke tests passing
---
.../audit-logging2/log4j2-config.properties | 90 ++++++++++++++++++++++
.../servers/audit-logging2/logging.properties | 80 -------------------
2 files changed, 90 insertions(+), 80 deletions(-)
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties
new file mode 100644
index 0000000000..5c8c6cbc74
--- /dev/null
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties
@@ -0,0 +1,90 @@
+# 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.
+
+# NOTE: Enabled base and message audit log for this smoke test
+# Log4J 2 configuration
+
+rootLogger = INFO, console, log_file
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+logger.artemis_server.name=org.apache.activemq.artemis.core.server
+logger.artemis_server.level=INFO
+
+logger.artemis_journal.name=org.apache.activemq.artemis.journal
+logger.artemis_journal.level=INFO
+
+logger.artemis_utils.name=org.apache.activemq.artemis.utils
+logger.artemis_utils.level=INFO
+
+# CriticalAnalyzer: If you have issues with the CriticalAnalyzer, setting this to TRACE would give
+# you extra troubleshooting info, but do not use TRACE regularly as it would incur extra CPU usage.
+logger.critical_analyzer.name=org.apache.activemq.artemis.utils.critical
+logger.critical_analyzer.level=INFO
+
+# Audit loggers: to enable change levels from OFF to INFO
+logger.audit_base = INFO, audit_log_file
+logger.audit_base.name = org.apache.activemq.audit.base
+logger.audit_base.additivity = false
+
+logger.audit_resource = OFF, audit_log_file
+logger.audit_resource.name = org.apache.activemq.audit.resource
+logger.audit_resource.additivity = false
+
+logger.audit_message = INFO, audit_log_file
+logger.audit_message.name = org.apache.activemq.audit.message
+logger.audit_message.additivity = false
+
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
+
+# Quorum related logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=ERROR
+
+
+# Console appender
+appender.console.type=Console
+appender.console.name=console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d %-5level [%logger] %msg%notEmpty{:%xEx}%n%ex{0}
+
+# Log file appender
+appender.log_file.type = RollingFile
+appender.log_file.name = log_file
+appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
+appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
+appender.log_file.layout.type = PatternLayout
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%notEmpty{:%xEx}%n%ex{0}
+appender.log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
+
+# Audit log file appender
+appender.audit_log_file.type = RollingFile
+appender.audit_log_file.name = audit_log_file
+appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
+appender.audit_log_file.layout.type = PatternLayout
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%notEmpty{:%xEx}%n%ex{0}
+appender.audit_log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging2/logging.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging2/logging.properties
deleted file mode 100644
index 1f375f9b8c..0000000000
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging2/logging.properties
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# 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=INFO
-logger.org.apache.activemq.audit.base.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.base.useParentHandlers=false
-
-logger.org.apache.activemq.audit.message.level=INFO
-logger.org.apache.activemq.audit.message.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.message.useParentHandlers=
-
-logger.org.apache.activemq.audit.resource.level=ERROR
-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=INFO
-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
[activemq-artemis] 07/42: add some deps needed/used already, look into test failure
Posted by cl...@apache.org.
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 b7111822acc9837c8aa3caad18025b66bf7f33f0
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 11 17:44:15 2022 +0100
add some deps needed/used already, look into test failure
---
artemis-protocols/artemis-amqp-protocol/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml
index 36e6105ab5..46f0df0abc 100644
--- a/artemis-protocols/artemis-amqp-protocol/pom.xml
+++ b/artemis-protocols/artemis-amqp-protocol/pom.xml
@@ -56,6 +56,11 @@
<!-- Superfluous, except for osgi manifest handling -->
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-log-facade</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -107,6 +112,11 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
[activemq-artemis] 08/42: Using Artemis Native 2.1.0 snapshot until 2.0.0 is released
Posted by cl...@apache.org.
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 7ccaabbe9498687b0420c8e0384d524eb27b7719
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Jul 11 16:46:02 2022 -0400
Using Artemis Native 2.1.0 snapshot until 2.0.0 is released
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 89949a466c..eb040b14c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<logging.config>log4j2-tests-config.properties</logging.config>
<modular.jdk.surefire.arg>--add-modules java.sql,jdk.unsupported </modular.jdk.surefire.arg>
- <activemq-artemis-native-version>2.0.0-SNAPSHOT</activemq-artemis-native-version>
+ <activemq-artemis-native-version>2.1.0-SNAPSHOT</activemq-artemis-native-version>
<karaf.version>4.3.3</karaf.version>
<pax.exam.version>4.13.4</pax.exam.version>
<commons.config.version>2.8.0</commons.config.version>