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/07/22 14:47:26 UTC
[activemq-artemis] branch new-logging updated (8bfc5ad425 -> f6f5aa0859)
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a change to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
from 8bfc5ad425 Adding a test with no argument on exception (just to be sure)
new 5f8b8111e9 some more helper additions to bring default assembly logging config into line with prior config
new 9e25c933f0 reset smoke test config to current base assembly config
new 629eec9b86 apply needed change only, and remove old unused logging.properties file
new af8ce03072 add some [in-flux] config to get more failing audit log smoke tests passing
new f6f5aa0859 add some TODO notes from memory
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
TODO-new-logging.txt | 9 +++
.../cli/commands/etc/log4j2-config.properties | 25 +++++--
.../servers/audit-logging/log4j2-config.properties | 57 +++++++++++----
.../servers/audit-logging/logging.properties | 80 ----------------------
.../audit-logging2}/log4j2-config.properties | 36 +++++++---
.../servers/audit-logging2/logging.properties | 80 ----------------------
6 files changed, 98 insertions(+), 189 deletions(-)
create mode 100644 TODO-new-logging.txt
delete mode 100644 tests/smoke-tests/src/main/resources/servers/audit-logging/logging.properties
copy {artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc => tests/smoke-tests/src/main/resources/servers/audit-logging2}/log4j2-config.properties (72%)
delete mode 100644 tests/smoke-tests/src/main/resources/servers/audit-logging2/logging.properties
[activemq-artemis] 04/05: add some [in-flux] config to get more failing audit log smoke tests passing
Posted by ro...@apache.org.
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 af8ce03072752a2f05894f67ff9ee7ad227c0f51
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 15:27:54 2022 +0100
add some [in-flux] config to get more failing audit log smoke tests passing
---
.../audit-logging2/log4j2-config.properties | 90 ++++++++++++++++++++++
.../servers/audit-logging2/logging.properties | 80 -------------------
2 files changed, 90 insertions(+), 80 deletions(-)
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties
new file mode 100644
index 0000000000..5c8c6cbc74
--- /dev/null
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties
@@ -0,0 +1,90 @@
+# 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.
+
+# NOTE: Enabled base and message audit log for this smoke test
+# Log4J 2 configuration
+
+rootLogger = INFO, console, log_file
+
+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 = INFO, 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 = INFO, 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%notEmpty{:%xEx}%n%ex{0}
+
+# 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%notEmpty{:%xEx}%n%ex{0}
+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%notEmpty{:%xEx}%n%ex{0}
+appender.audit_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
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging2/logging.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging2/logging.properties
deleted file mode 100644
index 1f375f9b8c..0000000000
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging2/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=INFO
-logger.org.apache.activemq.audit.base.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.base.useParentHandlers=false
-
-logger.org.apache.activemq.audit.message.level=INFO
-logger.org.apache.activemq.audit.message.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.message.useParentHandlers=
-
-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
-
-# 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
[activemq-artemis] 03/05: apply needed change only, and remove old unused logging.properties file
Posted by ro...@apache.org.
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 629eec9b8621621752af0a7ee452b4733b03616a
Author: Robbie Gemmell <ro...@apache.org>
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
[activemq-artemis] 01/05: some more helper additions to bring default assembly logging config into line with prior config
Posted by ro...@apache.org.
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 5f8b8111e9318491ea3b9f00abfae0269373170a
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 11:14:11 2022 +0100
some more helper additions to bring default assembly logging config into line with prior config
---
.../cli/commands/etc/log4j2-config.properties | 25 +++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
index e7c4bb41b1..8a32c0ad47 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
@@ -14,11 +14,26 @@
# limitations under the License.
# Log4J 2 configuration
+
rootLogger = INFO, console, log_file
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
@@ -32,16 +47,16 @@ logger.audit_message = OFF, audit_log_file
logger.audit_message.name = org.apache.activemq.audit.message
logger.audit_message.additivity = false
-# quorum logger levels
+# 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
-# Jetty logger levels
-logger.jetty.name=org.eclipse.jetty
-logger.jetty.level=WARN
-
# Console appender
appender.console.type=Console
[activemq-artemis] 05/05: add some TODO notes from memory
Posted by ro...@apache.org.
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 f6f5aa0859146d3b551ff2202feced546dd844d7
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 15:29:09 2022 +0100
add some TODO notes from memory
---
TODO-new-logging.txt | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/TODO-new-logging.txt b/TODO-new-logging.txt
new file mode 100644
index 0000000000..c807fe2c44
--- /dev/null
+++ b/TODO-new-logging.txt
@@ -0,0 +1,9 @@
+TODOs not explicitly noted in the code itself already:
+
+- Fix stacktraces of generated exceptions not to include the generated 'logmessage' method creating it.
+- Remove references to wildfly-common in scripts and profiles and cli commands
+- Replace logging.config files in smoke tests needing their own custom config
+- Remove stale logging.config file from artemis-cli
+- Remove stale log4j.properties file(s) from activemq5-unit-tests
+- Restore the NettySecurityClientTest and figure out what needs changed to make it work.
+- Restore the Travis config file
[activemq-artemis] 02/05: reset smoke test config to current base assembly config
Posted by ro...@apache.org.
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 9e25c933f0454b52d305e825edbd52e8d9a974d5
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 11:22:37 2022 +0100
reset smoke test config to current base assembly config
---
.../servers/audit-logging/log4j2-config.properties | 58 ++++++++++++++++------
1 file changed, 43 insertions(+), 15 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 7084e749ef..8a32c0ad47 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
@@ -14,48 +14,76 @@
# limitations under the License.
# Log4J 2 configuration
-rootLogger = INFO, Console
+
+rootLogger = INFO, console, log_file
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 = INFO, audit_log_file
+logger.audit_base = OFF, audit_log_file
logger.audit_base.name = org.apache.activemq.audit.base
logger.audit_base.additivity = false
-logger.audit_resource = INFO, audit_log_file
+logger.audit_resource = OFF, audit_log_file
logger.audit_resource.name = org.apache.activemq.audit.resource
logger.audit_resource.additivity = false
-logger.audit_message = INFO, audit_log_file
+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 logger levels
+# 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.name=console
appender.console.layout.type=PatternLayout
-#TODO: look at old/previous pattern and align
-appender.console.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
+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
-#TODO: look at old/previous filename pattern and behaviour and align
-appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit-%d{yyyy-MM-dd}.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 = [%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
-#TODO: look at old/previous pattern and align
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
appender.audit_log_file.policies.type = Policies
-appender.audit_log_file.policies.time.type = TimeBasedTriggeringPolicy
-appender.audit_log_file.policies.time.interval = 24
-appender.audit_log_file.policies.time.modulate = true
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true