diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerLoggingTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerLoggingTest.java
new file mode 100644
index 0000000000..ba0bee255f
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerLoggingTest.java
@@ -0,0 +1,171 @@
+/**
+ * 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.store;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.activemq.broker.LockableServiceSupport;
+import org.apache.activemq.broker.Locker;
+import org.apache.activemq.util.IOHelper;
+import org.apache.activemq.util.LockFile;
+import org.apache.activemq.util.ServiceStopper;
+import org.apache.activemq.util.Wait;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.apache.logging.log4j.core.config.Property;
+import org.apache.logging.log4j.core.filter.AbstractFilter;
+import org.apache.logging.log4j.core.layout.MessageLayout;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.slf4j.LoggerFactory;
+
+
+import static org.junit.Assert.assertTrue;
+
+public class SharedFileLockerLoggingTest {
+ private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(SharedFileLockerLoopTest.class);
+
+ @Rule
+ public TemporaryFolder testFolder;
+
+
+ public SharedFileLockerLoggingTest() {
+ File file = new File(IOHelper.getDefaultDataDirectory());
+ file.mkdir();
+
+ // TemporaryFolder will make sure the files are removed after the test is done
+ testFolder = new TemporaryFolder(file);
+ }
+
+ @Test
+ public void testLogging() throws Exception {
+ // using a bigger wait here
+ // to make sure we won't log any extra info
+ internalLoop(5);
+ }
+
+ private void internalLoop(long timewait) throws Exception {
+ final AtomicInteger logCounts = new AtomicInteger(0);
+
+ // start new
+ final var logger = org.apache.logging.log4j.core.Logger.class.cast(LogManager.getRootLogger());
+ final var appender = new AbstractAppender("testAppender", new AbstractFilter() {}, new MessageLayout(), false, new Property[0]) {
+ @Override
+ public void append(LogEvent event) {
+ if (event.getLevel() == Level.INFO) {
+ logCounts.incrementAndGet();
+ }
+ }
+ };
+ appender.start();
+
+ Configurator.setRootLevel(Level.DEBUG);
+ logger.get().addAppender(appender, Level.DEBUG, new AbstractFilter() {});
+ logger.addAppender(appender);
+
+ final AtomicInteger errors = new AtomicInteger(0);
+
+ Thread thread = null;
+
+ SharedFileLocker locker1 = new SharedFileLocker();
+ locker1.setDirectory(testFolder.getRoot());
+
+ final SharedFileLocker locker2 = new SharedFileLocker();
+ locker2.setLockAcquireSleepInterval(1);
+ locker2.setDirectory(testFolder.getRoot());
+
+
+ try {
+ locker1.doStart();
+
+ assertTrue(locker1.keepAlive());
+
+ thread = new Thread("Locker Thread") {
+ public void run() {
+ try {
+ locker2.doStart();
+ } catch (Throwable e) {
+ errors.incrementAndGet();
+ }
+ }
+ };
+
+ thread.start();
+
+ // I need to make sure the info was already logged
+ // but I don't want to have an unecessary wait here,
+ // as I want the test to run as fast as possible
+ {
+ long timeout = System.currentTimeMillis() + 5000;
+ while (logCounts.get() < 1 && System.currentTimeMillis() < timeout) {
+ Thread.sleep(1);
+ }
+ }
+
+ if (timewait > 0) {
+ Thread.sleep(timewait);
+ }
+
+ assertTrue(thread.isAlive());
+
+ locker1.stop();
+
+ // 10 seconds here is an eternity, but it should only take milliseconds
+ thread.join(5000);
+
+ Assert.assertEquals("Extra logs in place", 1, logCounts.get());
+
+ long timeout = System.currentTimeMillis() + 5000;
+
+ while (timeout > System.currentTimeMillis() && !locker2.keepAlive()) {
+ Thread.sleep(1);
+ }
+
+ assertTrue(locker2.keepAlive());
+
+ locker2.stop();
+
+ Assert.assertEquals(0, errors.get());
+
+ } finally {
+
+ logger.removeAppender(appender);
+
+ // to make sure we won't leak threads if the test ever failed for any reason
+ thread.join(1000);
+ if (thread.isAlive()) {
+ thread.interrupt();
+ }
+
+ File lockFile = new File(testFolder.getRoot(), "lock");
+ lockFile.delete();
+ }
+
+ }
+
+}
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerLoopTest.java
similarity index 96%
rename from activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerTest.java
rename to activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerLoopTest.java
index 0a2d1cb9bb..e4a9bf6e05 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerLoopTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.activemq.store;
import java.io.File;
@@ -48,20 +47,19 @@ import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertTrue;
-public class SharedFileLockerTest {
- private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(SharedFileLockerTest.class);
+public class SharedFileLockerLoopTest {
+ private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(SharedFileLockerLoopTest.class);
@Rule
public TemporaryFolder testFolder;
- public SharedFileLockerTest() {
+ public SharedFileLockerLoopTest() {
File file = new File(IOHelper.getDefaultDataDirectory());
file.mkdir();
// TemporaryFolder will make sure the files are removed after the test is done
testFolder = new TemporaryFolder(file);
-
}
@Test
@@ -80,14 +78,6 @@ public class SharedFileLockerTest {
}
-
- @Test
- public void testLogging() throws Exception {
- // using a bigger wait here
- // to make sure we won't log any extra info
- internalLoop(100);
- }
-
private void internalLoop(long timewait) throws Exception {
final AtomicInteger logCounts = new AtomicInteger(0);
@@ -96,7 +86,7 @@ public class SharedFileLockerTest {
final var appender = new AbstractAppender("testAppender", new AbstractFilter() {}, new MessageLayout(), false, new Property[0]) {
@Override
public void append(LogEvent event) {
- if (Level.INFO.equals(event.getLevel())) {
+ if (event.getLevel() == Level.INFO) {
logCounts.incrementAndGet();
}
}
diff --git a/activemq-unit-tests/src/test/resources/log4j2-test.properties b/activemq-unit-tests/src/test/resources/log4j2-test.properties
index 16e26c5226..143e2c1580 100644
--- a/activemq-unit-tests/src/test/resources/log4j2-test.properties
+++ b/activemq-unit-tests/src/test/resources/log4j2-test.properties
@@ -19,7 +19,6 @@
# The logging properties used during tests
#
rootLogger.level=INFO
-
rootLogger.appenderRef.console.ref=Console
rootLogger.appenderRef.logfile.ref=RollingFile
diff --git a/pom.xml b/pom.xml
index 231fec7b5e..6619b75963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,7 +224,7 @@
activemq-run
activemq-shiro
activemq-spring
- activemq-runtime-config
+
activemq-tooling
activemq-web
activemq-partition