You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/08/19 15:13:56 UTC
[activemq-artemis] 02/02: convert some more test loggers
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 5f975277c33465103c5686969dddf001f5dfc67a
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Aug 19 16:12:02 2022 +0100
convert some more test loggers
---
.../performance/journal/JournalImplTestUnit.java | 21 +++++++++++----------
.../performance/journal/RealJournalImplAIOTest.java | 7 ++++---
.../performance/journal/RealJournalImplNIOTest.java | 7 ++++---
.../paging/MultipleConsumersPageStressTest.java | 5 +++--
.../artemis/tests/stress/remote/PingStressTest.java | 7 ++++---
5 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java
index 2a3ce3a9d9..549eec88c8 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java
@@ -25,14 +25,15 @@ import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
import org.apache.activemq.artemis.nativo.jlibaio.LibaioContext;
import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase;
import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class JournalImplTestUnit extends JournalImplTestBase {
- private static final Logger log = Logger.getLogger(JournalImplTestBase.class);
+ private static final Logger log = LoggerFactory.getLogger(JournalImplTestBase.class);
@Override
@After
@@ -116,7 +117,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
update(updates);
delete(deletes);
- JournalImplTestUnit.log.debug("Debug journal:" + debugJournal());
+ JournalImplTestUnit.log.debug("Debug journal:{}", debugJournal());
stopJournal(false);
createJournal();
startJournal();
@@ -145,7 +146,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
}
if (count % 100 == 0) {
- JournalImplTestUnit.log.debug("Done: " + count);
+ JournalImplTestUnit.log.debug("Done: {}", count);
}
}
@@ -153,9 +154,9 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
double rate = 1000 * (double) NUMBER_OF_RECORDS / (end - start);
- JournalImplTestUnit.log.info("Rate of " + rate + " adds/removes per sec");
+ JournalImplTestUnit.log.info("Rate of {} adds/removes per sec", rate);
- JournalImplTestUnit.log.debug("Reclaim status = " + debugJournal());
+ JournalImplTestUnit.log.debug("Reclaim status = {}", debugJournal());
stopJournal();
createJournal();
@@ -211,13 +212,13 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
long end = System.currentTimeMillis();
for (double rate : rates) {
- JournalImplTestUnit.log.info("Transaction Rate = " + rate + " records/sec");
+ JournalImplTestUnit.log.info("Transaction Rate = {} records/sec", rate);
}
double rate = 1000 * (double) numMessages / (end - start);
- JournalImplTestUnit.log.info("Rate " + rate + " records/sec");
+ JournalImplTestUnit.log.info("Rate {} records/sec", rate);
} finally {
journal.stop();
}
@@ -233,7 +234,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
numFiles = 2;
}
- JournalImplTestUnit.log.debug("num Files=" + numFiles);
+ JournalImplTestUnit.log.debug("num Files={}", numFiles);
Journal journal = new JournalImpl(10 * 1024 * 1024, numFiles, numFiles, 0, 0, getFileFactory(), "activemq-data", "amq", 5000);
@@ -254,7 +255,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
double rate = 1000 * (double) numMessages / (end - start);
- JournalImplTestUnit.log.info("Rate " + rate + " records/sec");
+ JournalImplTestUnit.log.info("Rate {} records/sec", rate);
journal.stop();
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplAIOTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplAIOTest.java
index c98f876f36..5567a165d4 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplAIOTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplAIOTest.java
@@ -20,13 +20,14 @@ import java.io.File;
import org.apache.activemq.artemis.core.io.SequentialFileFactory;
import org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory;
-import org.jboss.logging.Logger;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RealJournalImplAIOTest extends JournalImplTestUnit {
- private static final Logger log = Logger.getLogger(RealJournalImplAIOTest.class);
+ private static final Logger log = LoggerFactory.getLogger(RealJournalImplAIOTest.class);
@BeforeClass
public static void hasAIO() {
@@ -43,7 +44,7 @@ public class RealJournalImplAIOTest extends JournalImplTestUnit {
protected SequentialFileFactory getFileFactory() throws Exception {
File file = new File(getTestDir());
- RealJournalImplAIOTest.log.debug("deleting directory " + file);
+ RealJournalImplAIOTest.log.debug("deleting directory {}", file);
deleteDirectory(file);
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplNIOTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplNIOTest.java
index cb912a4c48..ae71432828 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplNIOTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplNIOTest.java
@@ -20,17 +20,18 @@ import java.io.File;
import org.apache.activemq.artemis.core.io.SequentialFileFactory;
import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RealJournalImplNIOTest extends JournalImplTestUnit {
- private static final Logger log = Logger.getLogger(RealJournalImplNIOTest.class);
+ private static final Logger log = LoggerFactory.getLogger(RealJournalImplNIOTest.class);
@Override
protected SequentialFileFactory getFileFactory() throws Exception {
File file = new File(getTestDir());
- RealJournalImplNIOTest.log.debug("deleting directory " + getTestDir());
+ RealJournalImplNIOTest.log.debug("deleting directory {}", getTestDir());
deleteDirectory(file);
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java
index bc071469f9..35c9f2e8bb 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java
@@ -34,14 +34,15 @@ import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.core.server.impl.QueueImpl;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MultipleConsumersPageStressTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(MultipleConsumersPageStressTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MultipleConsumersPageStressTest.class);
private static final int TIME_TO_RUN = 60 * 1000;
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java
index e23f6d9acb..f623c52d6e 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java
@@ -30,13 +30,14 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.jboss.logging.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PingStressTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(PingStressTest.class);
+ private static final Logger log = LoggerFactory.getLogger(PingStressTest.class);
private static final long PING_INTERVAL = 500;
@@ -73,7 +74,7 @@ public class PingStressTest extends ActiveMQTestBase {
Interceptor noPongInterceptor = new Interceptor() {
@Override
public boolean intercept(final Packet packet, final RemotingConnection conn) throws ActiveMQException {
- PingStressTest.log.info("In interceptor, packet is " + packet.getType());
+ PingStressTest.log.info("In interceptor, packet is {}", packet.getType());
if (packet.getType() == PacketImpl.PING) {
PingStressTest.log.info("Ignoring Ping packet.. it will be dropped");
return false;