From 25390ec214ce1e871d6745097461dd851b789430 Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Fri, 8 Apr 2016 13:55:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=202.=20=E4=BF=AE=E6=94=B9log4j=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storage/chain/SaveToHBaseChain.java       | 43 +++++++++++--------
 .../src/main/resources/log4j.xml              | 27 +++++++-----
 .../src/main/resources/log4j2.xml             | 30 ++++++++-----
 3 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java
index 39a02c744..3a8b50e9a 100644
--- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java
+++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java
@@ -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);
diff --git a/skywalking-server/src/main/resources/log4j.xml b/skywalking-server/src/main/resources/log4j.xml
index e28023547..22859c554 100644
--- a/skywalking-server/src/main/resources/log4j.xml
+++ b/skywalking-server/src/main/resources/log4j.xml
@@ -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>
\ No newline at end of file
diff --git a/skywalking-server/src/main/resources/log4j2.xml b/skywalking-server/src/main/resources/log4j2.xml
index 4559d6d69..0da420637 100644
--- a/skywalking-server/src/main/resources/log4j2.xml
+++ b/skywalking-server/src/main/resources/log4j2.xml
@@ -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>
\ No newline at end of file