[activemq-artemis] branch new-logging updated: adjusting defaults

[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


The following commit(s) were added to refs/heads/new-logging by this push:
     new 0961d0e969 adjusting defaults
0961d0e969 is described below

commit 0961d0e969b263d153686506ea3083576e0d5982
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Fri Sep 2 17:47:19 2022 -0400

    adjusting defaults
---
 pom.xml                                            |  8 -----
 tests/config/log4j2-tests-config-CI.properties     | 42 ----------------------
 tests/config/log4j2-tests-config.properties        |  8 ++++-
 .../tests/unit/logging/AssertionLoggerTest.java    |  2 +-
 4 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/pom.xml b/pom.xml
index e40af01381..5f04bd3af9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1274,14 +1274,6 @@
             <retryTests>true</retryTests>
          </properties>
       </profile>
-      <profile>
-         <!-- this will activate the property required to limit logging on the testsuite -->
-         <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>log4j2-tests-config-CI.properties</logging.config>
-         </properties>
-      </profile>
       <profile>
          <!-- tests is the profile we use to run the entire testsuite
                Running this entire build could take up to 2 hours -->
diff --git a/tests/config/log4j2-tests-config-CI.properties b/tests/config/log4j2-tests-config-CI.properties
deleted file mode 100644
index b912c9aeeb..0000000000
--- a/tests/config/log4j2-tests-config-CI.properties
+++ /dev/null
@@ -1,42 +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.
-
-# Log4J 2 configuration used in tests in CI
-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
-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
index 982efa2741..b912c9aeeb 100644
--- a/tests/config/log4j2-tests-config.properties
+++ b/tests/config/log4j2-tests-config.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Log4J 2 configuration used in tests.
+# Log4J 2 configuration used in tests in CI
 rootLogger = INFO, Console, Test
 
 logger.activemq.name=org.apache.activemq
@@ -23,6 +23,12 @@ logger.activemq.level=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
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=WARN
+
 # Console appender
 appender.console.type=Console
 appender.console.name=Console
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/logging/AssertionLoggerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/logging/AssertionLoggerTest.java
index 605bb8b9bf..12fd09a3a2 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/logging/AssertionLoggerTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/logging/AssertionLoggerTest.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 /**
  * This will validate the AssertionLoggerHandler is working as expected.
  * Even though the class belongs to artemis-unit-test-support, this test has to be done here as we
- * are validating the log4j2-tests-config.properties and log4j2-tests-config-CI.properties files and the classloading of everything.
+ * are validating the log4j2-tests-config.properties files and the classloading of everything.
  */
 public class AssertionLoggerTest {