You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by vo...@apache.org on 2022/01/16 12:39:10 UTC
[rocketmq] branch develop updated: Avoid new lines in log (#3762)
This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 4f39218 Avoid new lines in log (#3762)
4f39218 is described below
commit 4f39218066523344a9cca65946c3ae1b0f1a6218
Author: yuz10 <84...@qq.com>
AuthorDate: Sun Jan 16 20:38:48 2022 +0800
Avoid new lines in log (#3762)
---
.../main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java | 2 +-
.../src/main/java/org/apache/rocketmq/logging/inner/LoggingEvent.java | 3 +++
pom.xml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java b/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java
index 3ec440b..7468cd4 100644
--- a/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java
+++ b/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java
@@ -1209,7 +1209,7 @@ public class LoggingBuilder {
sb.append(" ");
sb.append(event.getLoggerName());
sb.append(" - ");
- sb.append(event.getMessage());
+ sb.append(event.getRenderedMessage());
String[] throwableStr = event.getThrowableStr();
if (throwableStr != null) {
sb.append("\r\n");
diff --git a/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingEvent.java b/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingEvent.java
index 1b3e955..44554e2 100644
--- a/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingEvent.java
+++ b/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingEvent.java
@@ -68,6 +68,9 @@ public class LoggingEvent implements java.io.Serializable {
} else {
renderedMessage = message.toString();
}
+ if (renderedMessage != null) {
+ renderedMessage = renderedMessage.replace('\r', ' ').replace('\n', ' ');
+ }
}
return renderedMessage;
}
diff --git a/pom.xml b/pom.xml
index 19abca0..c2c8f8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -527,7 +527,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.0.13</version>
+ <version>1.2.10</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>