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 7c71c5b38a59e4d120bebb0c8f91207f64293d25 Author: Robbie Gemmell <[email protected]> AuthorDate: Wed Jul 13 18:37:38 2022 +0100 fix format of code prefix in messages, pointed out by failing test --- .../src/test/java/org/apache/activemq/cli/test/ArtemisTest.java | 2 +- .../java/org/apache/activemq/artemis/logprocessor/LogProcessor.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java index eb12c8e951..984b2887d5 100644 --- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java +++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java @@ -507,7 +507,7 @@ public class ArtemisTest extends CliTestBase { context = new TestActionContext(); addCmd.execute(context); result = context.getStderr(); - assertTrue(result.contains("Failed to add user scott. Reason: AMQ229223: User scott already exists")); + assertTrue("Unexpected output: '" + result + "'", result.contains("Failed to add user scott. Reason: AMQ229223: User scott already exists")); //check existing users are intact context = new TestActionContext(); diff --git a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java index a3f80f3c29..d88d690eaa 100644 --- a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java +++ b/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/LogProcessor.java @@ -240,7 +240,7 @@ public class LogProcessor extends AbstractProcessor { writerOutput.println(")"); writerOutput.println(" {"); - String formattingString = encodeSpecialChars(bundleAnnotation.projectCode() + messageAnnotation.id() + " " + messageAnnotation.value()); + String formattingString = encodeSpecialChars(bundleAnnotation.projectCode() + messageAnnotation.id() + ": " + messageAnnotation.value()); if (!hasParameters) { writerOutput.println(" String returnString = \"" + formattingString + "\";"); } else { @@ -390,7 +390,7 @@ public class LogProcessor extends AbstractProcessor { } //TODO: handle causes being passed in the args to be logged, but not necessarily (often not) being last arg at present as SLF4J/frameworks expect. - String formattingString = encodeSpecialChars(bundleAnnotation.projectCode() + messageAnnotation.id() + " " + messageAnnotation.value()); + String formattingString = encodeSpecialChars(bundleAnnotation.projectCode() + messageAnnotation.id() + ": " + messageAnnotation.value()); if (!hasParameters) { writerOutput.println(" logger." + methodName + "(\"" + formattingString + "\");"); } else {
