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 16:27:56 UTC
[activemq-artemis] 02/02: simplify test logging config again, adjust assertion to be more specific and take into account change in output from 07329118c10d14bce018a580b0dadbcf081233a8
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 413577537cc23cc5e235e6fa0b1db97710f88123
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 22 17:27:27 2022 +0100
simplify test logging config again, adjust assertion to be more specific and take into account change in output from 07329118c10d14bce018a580b0dadbcf081233a8
---
.../main/resources/servers/audit-logging2/log4j2-config.properties | 6 +++---
.../activemq/artemis/tests/smoke/logging/AuditLoggerTest.java | 2 +-
2 files changed, 4 insertions(+), 4 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
index 5c8c6cbc74..690d09ae39 100644
--- 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
@@ -63,7 +63,7 @@ logger.zookeeper.level=ERROR
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}
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
# Log file appender
appender.log_file.type = RollingFile
@@ -71,7 +71,7 @@ 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.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 * * ?
@@ -83,7 +83,7 @@ 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.layout.pattern = %d [AUDIT](%t) %msg%n
appender.audit_log_file.policies.type = Policies
appender.log_file.policies.cron.type = CronTriggeringPolicy
appender.log_file.policies.cron.schedule = 0 0 0 * * ?
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
index 820c2acafb..3eb1b79109 100644
--- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
@@ -112,7 +112,7 @@ public class AuditLoggerTest extends AuditLoggerTestBase {
//ignore
}
- checkAuditLogRecord(true, "gets security check failure:", "guest does not have permission='DELETE_NON_DURABLE_QUEUE'");
+ checkAuditLogRecord(true, "AMQ601264: User guest", "gets security check failure, reason = AMQ229213: User: guest does not have permission='DELETE_NON_DURABLE_QUEUE'");
//hot patch not in log
checkAuditLogRecord(true, "is sending a message");
}