Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
Slf4j Kafka
Commits
b7ca8d02
Commit
b7ca8d02
authored
7 years ago
by
zhangzhenbin
Browse files
Options
Download
Email Patches
Plain Diff
修复Springboot下的表现
parent
4304bc0b
v-tuandai-1.0.1
v-tuandai-1.0
No related merge requests found
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
pom.xml
+14
-2
pom.xml
slf4j-kafka-over-log4j12/pom.xml
+2
-2
slf4j-kafka-over-log4j12/pom.xml
slf4j-kafka-over-log4j12/src/main/java/com/tuandai/log/log4j12/converter/EncodedMessagePatternConverter.java
+4
-1
...log/log4j12/converter/EncodedMessagePatternConverter.java
slf4j-kafka-over-logback/pom.xml
+2
-2
slf4j-kafka-over-logback/pom.xml
slf4j-kafka-over-logback/src/main/java/com/tuandai/log/logback/converter/EncodedMessageConverter.java
+4
-1
...uandai/log/logback/converter/EncodedMessageConverter.java
slf4j-kafka-over-logback/src/main/resources/logback.xml
+1
-1
slf4j-kafka-over-logback/src/main/resources/logback.xml
slf4j-kafka-over-logback/src/test/resources/logback.xml
+1
-1
slf4j-kafka-over-logback/src/test/resources/logback.xml
slf4j-kafka-producer/pom.xml
+2
-1
slf4j-kafka-producer/pom.xml
slf4j-kafka-producer/src/main/java/com/tuandai/log/kafka/config/Slf4jKafkaConfigSimpleFactory.java
+1
-1
...andai/log/kafka/config/Slf4jKafkaConfigSimpleFactory.java
with
31 additions
and
12 deletions
+31
-12
pom.xml
+
14
-
2
View file @
b7ca8d02
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
slf4j-kafka-over-log4j12/pom.xml
+
2
-
2
View file @
b7ca8d02
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
slf4j-kafka-over-log4j12/src/main/java/com/tuandai/log/log4j12/converter/EncodedMessagePatternConverter.java
+
4
-
1
View file @
b7ca8d02
...
...
@@ -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"
));
}
}
This diff is collapsed.
Click to expand it.
slf4j-kafka-over-logback/pom.xml
+
2
-
2
View file @
b7ca8d02
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
slf4j-kafka-over-logback/src/main/java/com/tuandai/log/logback/converter/EncodedMessageConverter.java
+
4
-
1
View file @
b7ca8d02
...
...
@@ -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
;
}
}
This diff is collapsed.
Click to expand it.
slf4j-kafka-over-logback/src/main/resources/logback.xml
+
1
-
1
View file @
b7ca8d02
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
slf4j-kafka-over-logback/src/test/resources/logback.xml
+
1
-
1
View file @
b7ca8d02
...
...
@@ -12,7 +12,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': '${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>
...
...
This diff is collapsed.
Click to expand it.
slf4j-kafka-producer/pom.xml
+
2
-
1
View file @
b7ca8d02
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
slf4j-kafka-producer/src/main/java/com/tuandai/log/kafka/config/Slf4jKafkaConfigSimpleFactory.java
+
1
-
1
View file @
b7ca8d02
...
...
@@ -34,7 +34,7 @@ public class Slf4jKafkaConfigSimpleFactory {
* @return 配置文件URL
*/
private
URL
getConfigFileUrl
(){
ClassLoader
myClassLoader
=
Slf4jKafkaConfigSimpleFactory
.
class
.
ge
tClassLoader
();
ClassLoader
myClassLoader
=
Thread
.
currentThread
().
getContex
tClassLoader
();
try
{
return
myClassLoader
.
getResource
(
DEFAULT_CONFIGURATION_FILE
);
}
catch
(
Throwable
t
)
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help