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 4145dc9e12c44798cb7904900fec00cb4e7abd55 Author: Robbie Gemmell <[email protected]> AuthorDate: Wed Aug 17 16:41:54 2022 +0100 replace logging.properties files for e2e-tests server configs --- TODO-new-logging.txt | 1 - .../brokerConnect/serverA/log4j2-config.properties | 95 ++++++++++++++++++++++ .../brokerConnect/serverA/logging.properties | 86 -------------------- .../brokerConnect/serverB/log4j2-config.properties | 95 ++++++++++++++++++++++ .../brokerConnect/serverB/logging.properties | 86 -------------------- .../splitMirror/serverA/log4j2-config.properties | 95 ++++++++++++++++++++++ .../splitMirror/serverA/logging.properties | 86 -------------------- .../splitMirror/serverB/log4j2-config.properties | 95 ++++++++++++++++++++++ .../splitMirror/serverB/logging.properties | 86 -------------------- .../serverRoot/log4j2-config.properties | 95 ++++++++++++++++++++++ .../splitMirror/serverRoot/logging.properties | 86 -------------------- 11 files changed, 475 insertions(+), 431 deletions(-) diff --git a/TODO-new-logging.txt b/TODO-new-logging.txt index 6d67a58ce2..7ffa30c247 100644 --- a/TODO-new-logging.txt +++ b/TODO-new-logging.txt @@ -1,6 +1,5 @@ TODOs not explicitly noted in the code itself already: -- Update e2e-tests instance logging config and scripts/profiles - Remove JBL use from last remaining tests etc tests still using it - Fix stacktraces of generated exceptions not to include the generated 'logmessage' method creating it. - Replace logging.config files in remaining tests/examples needing their own custom config diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/log4j2-config.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/log4j2-config.properties new file mode 100644 index 0000000000..d116f440ce --- /dev/null +++ b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/log4j2-config.properties @@ -0,0 +1,95 @@ +# 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, log_file + +# Additional loggers for debugging mirror, candidates to eventually debug: +logger.mirror_controller_target.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget +logger.mirror_controller_target.level=INFO + +# Regular config + +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.audit_log_file.policies.cron.type = CronTriggeringPolicy +appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ? +appender.audit_log_file.policies.cron.evaluateOnStartup = true diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/logging.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/logging.properties deleted file mode 100644 index 810329f515..0000000000 --- a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/logging.properties +++ /dev/null @@ -1,86 +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.activemq.artemis.utils.pools,org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirro [...] - -# Special logger to debug mirror Security - -# Root logger level -logger.level=INFO -# ActiveMQ Artemis logger levels - -# These levels are candidates to eventually debug -logger.org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.level=INFO - -# 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.eclipse.jetty.level=WARN -# Root logger handlers -logger.handlers=FILE,CONSOLE - -# 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=TRACE -handler.CONSOLE.autoFlush=true -handler.CONSOLE.formatter=PATTERN - -# File handler configuration -handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler -handler.FILE.level=TRACE -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=[%t] %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 diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/log4j2-config.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/log4j2-config.properties new file mode 100644 index 0000000000..d116f440ce --- /dev/null +++ b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/log4j2-config.properties @@ -0,0 +1,95 @@ +# 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, log_file + +# Additional loggers for debugging mirror, candidates to eventually debug: +logger.mirror_controller_target.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget +logger.mirror_controller_target.level=INFO + +# Regular config + +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.audit_log_file.policies.cron.type = CronTriggeringPolicy +appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ? +appender.audit_log_file.policies.cron.evaluateOnStartup = true diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/logging.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/logging.properties deleted file mode 100644 index 810329f515..0000000000 --- a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/logging.properties +++ /dev/null @@ -1,86 +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.activemq.artemis.utils.pools,org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirro [...] - -# Special logger to debug mirror Security - -# Root logger level -logger.level=INFO -# ActiveMQ Artemis logger levels - -# These levels are candidates to eventually debug -logger.org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.level=INFO - -# 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.eclipse.jetty.level=WARN -# Root logger handlers -logger.handlers=FILE,CONSOLE - -# 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=TRACE -handler.CONSOLE.autoFlush=true -handler.CONSOLE.formatter=PATTERN - -# File handler configuration -handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler -handler.FILE.level=TRACE -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=[%t] %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 diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/log4j2-config.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/log4j2-config.properties new file mode 100644 index 0000000000..d116f440ce --- /dev/null +++ b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/log4j2-config.properties @@ -0,0 +1,95 @@ +# 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, log_file + +# Additional loggers for debugging mirror, candidates to eventually debug: +logger.mirror_controller_target.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget +logger.mirror_controller_target.level=INFO + +# Regular config + +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.audit_log_file.policies.cron.type = CronTriggeringPolicy +appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ? +appender.audit_log_file.policies.cron.evaluateOnStartup = true diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/logging.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/logging.properties deleted file mode 100644 index 810329f515..0000000000 --- a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/logging.properties +++ /dev/null @@ -1,86 +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.activemq.artemis.utils.pools,org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirro [...] - -# Special logger to debug mirror Security - -# Root logger level -logger.level=INFO -# ActiveMQ Artemis logger levels - -# These levels are candidates to eventually debug -logger.org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.level=INFO - -# 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.eclipse.jetty.level=WARN -# Root logger handlers -logger.handlers=FILE,CONSOLE - -# 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=TRACE -handler.CONSOLE.autoFlush=true -handler.CONSOLE.formatter=PATTERN - -# File handler configuration -handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler -handler.FILE.level=TRACE -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=[%t] %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 diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/log4j2-config.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/log4j2-config.properties new file mode 100644 index 0000000000..d116f440ce --- /dev/null +++ b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/log4j2-config.properties @@ -0,0 +1,95 @@ +# 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, log_file + +# Additional loggers for debugging mirror, candidates to eventually debug: +logger.mirror_controller_target.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget +logger.mirror_controller_target.level=INFO + +# Regular config + +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.audit_log_file.policies.cron.type = CronTriggeringPolicy +appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ? +appender.audit_log_file.policies.cron.evaluateOnStartup = true diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/logging.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/logging.properties deleted file mode 100644 index 810329f515..0000000000 --- a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/logging.properties +++ /dev/null @@ -1,86 +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.activemq.artemis.utils.pools,org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirro [...] - -# Special logger to debug mirror Security - -# Root logger level -logger.level=INFO -# ActiveMQ Artemis logger levels - -# These levels are candidates to eventually debug -logger.org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.level=INFO - -# 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.eclipse.jetty.level=WARN -# Root logger handlers -logger.handlers=FILE,CONSOLE - -# 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=TRACE -handler.CONSOLE.autoFlush=true -handler.CONSOLE.formatter=PATTERN - -# File handler configuration -handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler -handler.FILE.level=TRACE -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=[%t] %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 diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/log4j2-config.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/log4j2-config.properties new file mode 100644 index 0000000000..d116f440ce --- /dev/null +++ b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/log4j2-config.properties @@ -0,0 +1,95 @@ +# 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, log_file + +# Additional loggers for debugging mirror, candidates to eventually debug: +logger.mirror_controller_target.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget +logger.mirror_controller_target.level=INFO + +# Regular config + +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.audit_log_file.policies.cron.type = CronTriggeringPolicy +appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ? +appender.audit_log_file.policies.cron.evaluateOnStartup = true diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/logging.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/logging.properties deleted file mode 100644 index 810329f515..0000000000 --- a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/logging.properties +++ /dev/null @@ -1,86 +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.activemq.artemis.utils.pools,org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirro [...] - -# Special logger to debug mirror Security - -# Root logger level -logger.level=INFO -# ActiveMQ Artemis logger levels - -# These levels are candidates to eventually debug -logger.org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.level=INFO - -# 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.eclipse.jetty.level=WARN -# Root logger handlers -logger.handlers=FILE,CONSOLE - -# 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=TRACE -handler.CONSOLE.autoFlush=true -handler.CONSOLE.formatter=PATTERN - -# File handler configuration -handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler -handler.FILE.level=TRACE -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=[%t] %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
