kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 增加异常打印 

2. 修改log4j日志配置
This commit is contained in:
ascrutae 2016-04-08 13:55:29 +08:00
parent 602d48367f
commit 25390ec214
3 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java
View File

@ -102,27 +102,32 @@ public class SaveToHBaseChain implements IStorageChain {
for (Span span : spans) {
put = new Put(Bytes.toBytes(span.getTraceId()),
getTSBySpanTraceId(span));
if (StringUtils.isEmpty(span.getParentLevel().trim())) {
columnName = span.getLevelId() + "";
if (span.isReceiver()) {
columnName = span.getLevelId() + "-S";
try {
if (StringUtils.isEmpty(span.getParentLevel().trim())) {
columnName = span.getLevelId() + "";
if (span.isReceiver()) {
columnName = span.getLevelId() + "-S";
}
put.addColumn(
Bytes.toBytes(Config.HBaseConfig.FAMILY_COLUMN_NAME),
Bytes.toBytes(columnName),
Bytes.toBytes(span.getOriginData()));
} else {
columnName = span.getParentLevel() + "." + span.getLevelId();
if (span.isReceiver()) {
columnName = span.getParentLevel() + "."
+ span.getLevelId() + "-S";
}
put.addColumn(
Bytes.toBytes(Config.HBaseConfig.FAMILY_COLUMN_NAME),
Bytes.toBytes(columnName),
Bytes.toBytes(span.getOriginData()));
}
put.addColumn(
Bytes.toBytes(Config.HBaseConfig.FAMILY_COLUMN_NAME),
Bytes.toBytes(columnName),
Bytes.toBytes(span.getOriginData()));
} else {
columnName = span.getParentLevel() + "." + span.getLevelId();
if (span.isReceiver()) {
columnName = span.getParentLevel() + "."
+ span.getLevelId() + "-S";
}
put.addColumn(
Bytes.toBytes(Config.HBaseConfig.FAMILY_COLUMN_NAME),
Bytes.toBytes(columnName),
Bytes.toBytes(span.getOriginData()));
puts.add(put);
}catch (Throwable e){
logger.error("Failed to save to Span[{}] to hbase", span.toString());
throw e;
}
puts.add(put);
}
bulkInsertBuriedPointData(Config.HBaseConfig.TABLE_NAME, puts);

27
skywalking-server/src/main/resources/log4j.xml
View File

@ -1,19 +1,26 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration>
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="consoleAppend" class="org.apache.log4j.ConsoleAppender" >
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%d - %c -%-4r [%t](%F:%L) %-5p %x - %m%n" />
<param name="ConversionPattern" value="%-d{yyyy-MM-dd HH:mm:ss} [%5p][%t][%c{1}]-[%M] %m%n" />
</layout>
</appender>
<appender name="bizAppend" class="org.apache.log4j.DailyRollingFileAppender">
<param name="File" value="../log/skywalking-server.log" />
<param name="Append" value="true" />
<param name="DatePattern" value="'.'yyyy-MM-dd-HH'.log'" />
<param name="encoding" value="utf-8"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="[date:%d{yyyy-MM-dd HH:mm:ss}] %m%n" />
</layout>
</appender>
<root>
<priority value="debug" />
<appender-ref ref="CONSOLE" />
<priority value="INFO" />
<appender-ref ref="bizAppend" />
</root>
</log4j:configuration>
</log4j:configuration>

30
skywalking-server/src/main/resources/log4j2.xml
View File

@ -1,13 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="debug">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t](%F:%L) %-5level %logger{36} - %msg%n"/>
</Console>
</Appenders>
<Loggers>
<Root level="debug">
<AppenderRef ref="Console"/>
</Root>
</Loggers>
<appender name="consoleAppend" class="org.apache.log4j.ConsoleAppender" >
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-d{yyyy-MM-dd HH:mm:ss} [%5p][%t][%c{1}]-[%M] %m%n" />
</layout>
</appender>
<appender name="bizAppend" class="org.apache.log4j.DailyRollingFileAppender">
<param name="File" value="../log/skywalking-server.log" />
<param name="Append" value="true" />
<param name="DatePattern" value="'.'yyyy-MM-dd-HH'.log'" />
<param name="encoding" value="utf-8"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="[date:%d{yyyy-MM-dd HH:mm:ss}] %m%n" />
</layout>
</appender>
<root>
<priority value="INFO" />
<appender-ref ref="bizAppend" />
</root>
</Configuration>