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 <[email protected]> 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
