Commit b7ca8d02 authored by zhangzhenbin's avatar zhangzhenbin
Browse files

修复Springboot下的表现

No related merge requests found
Showing with 31 additions and 12 deletions
+31 -12
......@@ -12,8 +12,20 @@
</modules>
<groupId>com.tuandai.log</groupId>
<artifactId>slf4j-kafka</artifactId>
<version>1.7.5</version>
<version>1.0.1-SNAPSHOT</version>
<distributionManagement>
<snapshotRepository>
<id>td-snapshot</id>
<name>User Porject Snapshot</name>
<url>http://nexus.tuandai.com/repository/maven-snapshots/</url>
<uniqueVersion>true</uniqueVersion>
</snapshotRepository>
<repository>
<id>td-release</id>
<name>User Porject Release</name>
<url>http://nexus.tuandai.com/repository/maven-releases/</url>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>slf4j-kafka</artifactId>
<groupId>com.tuandai.log</groupId>
<version>1.7.5</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -43,7 +43,7 @@
<dependency>
<groupId>com.tuandai.log</groupId>
<artifactId>slf4j-kafka-producer</artifactId>
<version>1.7.5</version>
<version>1.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
......
......@@ -39,6 +39,9 @@ public class EncodedMessagePatternConverter extends LoggingEventPatternConverter
* {@inheritDoc}
*/
public void format(final LoggingEvent event, final StringBuffer toAppendTo) {
toAppendTo.append(event.getRenderedMessage().replace("\"","\\\"").replace("'","\\'"));
toAppendTo.append(event.getRenderedMessage()
.replaceAll("\"","\\\"")
.replaceAll("'","\\'")
.replaceAll("\n","\\n"));
}
}
......@@ -5,7 +5,7 @@
<parent>
<artifactId>slf4j-kafka</artifactId>
<groupId>com.tuandai.log</groupId>
<version>1.7.5</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -35,7 +35,7 @@
<dependency>
<groupId>com.tuandai.log</groupId>
<artifactId>slf4j-kafka-producer</artifactId>
<version>1.7.5</version>
<version>1.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
......
......@@ -12,6 +12,9 @@ import com.tuandai.log.kafka.config.Slf4jKafkaContext;
public class EncodedMessageConverter extends ClassicConverter {
@Override
public String convert(ILoggingEvent event) {
return event.getFormattedMessage().replace("\"","\\\"").replace("'","\\'");
String s = event.getFormattedMessage().replaceAll("\"", "\\\"")
.replaceAll("'", "\\'")
.replaceAll("\n", "\\n");
return s;
}
}
......@@ -9,7 +9,7 @@
</encoder>
</appender>
<property name="KAFKA_PATTERN" value='{"@timestamp": "%d{yyyy-MM-dd"T"HH:mm:ss.SSS"Z"}","beat": { "hostname": "${HOSTNAME}","name": "%sys_user", "version": "5.2.2" }, "fields": { "app_id": "%app_id" }, "input_type": "log", "message": "%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p %pid --- [%15.15t] %-40.40logger{39} : %encode_message%n", "offset": 0, "source": "", "type": "log" }' />
<property name="KAFKA_PATTERN" value='{"@timestamp": "%d{yyyy-MM-dd HH:mm:ss.SSS}","beat": { "hostname": "${HOSTNAME}","name": "%sys_user", "version": "5.2.2" }, "fields": { "app_id": "%app_id" }, "input_type": "log", "message": "%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p %pid --- [%15.15t] %-40.40logger{39} : %encode_message%n", "offset": 0, "source": "", "type": "log" }' />
<appender name="KAFKA" class="com.tuandai.log.logback.appender.KafkaConcurrentAppender">
<encoder class="com.tuandai.log.logback.layout.ExtendedPatternLayoutEncoder">
<pattern>${KAFKA_PATTERN}</pattern>
......
......@@ -12,7 +12,7 @@
</encoder>
</appender>
<property name="KAFKA_PATTERN" value="{'@timestamp': '%d{yyyy-MM-ddTHH:mm:ss.SSSZ}','beat': { 'hostname': '${HOSTNAME}','name': '%sys_user', 'version': '5.2.2' }, 'fields': { 'app_id': '%app_id' }, 'input_type': 'log', 'message': '${LOG_PATTERN}', 'offset': 0, 'source': '', 'type': 'log' }" />
<property name="KAFKA_PATTERN" value="{'@timestamp': '%d{yyyy-MM-dd HH:mm:ss.SSS}','beat': { 'hostname': '${HOSTNAME}','name': '%sys_user', 'version': '5.2.2' }, 'fields': { 'app_id': '%app_id' }, 'input_type': 'log', 'message': '${LOG_PATTERN}', 'offset': 0, 'source': '', 'type': 'log' }" />
<appender name="KAFKA" class="com.tuandai.log.logback.appender.KafkaAppender">
<encoder class="com.tuandai.log.logback.layout.ExtendedPatternLayoutEncoder">
<pattern>${KAFKA_PATTERN}</pattern>
......
......@@ -5,7 +5,8 @@
<parent>
<artifactId>slf4j-kafka</artifactId>
<groupId>com.tuandai.log</groupId>
<version>1.7.5</version>
<version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -34,7 +34,7 @@ public class Slf4jKafkaConfigSimpleFactory {
* @return 配置文件URL
*/
private URL getConfigFileUrl(){
ClassLoader myClassLoader = Slf4jKafkaConfigSimpleFactory.class.getClassLoader();
ClassLoader myClassLoader = Thread.currentThread().getContextClassLoader();
try {
return myClassLoader.getResource(DEFAULT_CONFIGURATION_FILE);
} catch (Throwable t) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment