From ea638df0927264585da9cb1a727f2d9b31b4d0ee Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Tue, 5 Apr 2016 07:48:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=A7=E7=BA=B2=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E4=BB=A5=E5=8F=8Afix=20#35?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/skywalking/web/bo/TraceNodeInfo.java   | 10 ++++++++++
 .../skywalking/web/dao/impl/TraceNodeDao.java    |  2 ++
 .../bower_components/skywalking/js/tracelog.js   | 16 ++++++++++++++++
 .../src/main/webapp/pages/common/traceInfo.ftl   | 11 +++++++++--
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/bo/TraceNodeInfo.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/bo/TraceNodeInfo.java
index 3ab233198..0930ccbb0 100644
--- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/bo/TraceNodeInfo.java
+++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/bo/TraceNodeInfo.java
@@ -39,6 +39,8 @@ public class TraceNodeInfo extends Span {
 
     private String viewPointIdSub;
 
+    private String serverExceptionStr;
+
     private TraceNodeInfo() {
     }
 
@@ -182,4 +184,12 @@ public class TraceNodeInfo extends Span {
     public String getStatusCodeName() {
         return statusCodeName;
     }
+
+    public String getServerExceptionStr() {
+        return serverExceptionStr;
+    }
+
+    public void setServerExceptionStr(String serverExceptionStr) {
+        this.serverExceptionStr = serverExceptionStr;
+    }
 }
diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/dao/impl/TraceNodeDao.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/dao/impl/TraceNodeDao.java
index d0c198dba..c70c871a7 100644
--- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/dao/impl/TraceNodeDao.java
+++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/dao/impl/TraceNodeDao.java
@@ -77,6 +77,8 @@ public class TraceNodeDao implements ITraceNodeDao {
                         clientLog.setAddress(serverLog.getAddress());
                         if (StringUtil.isBlank(clientLog.getExceptionStack())) {
                             clientLog.setExceptionStack(serverLog.getExceptionStack());
+                        }else{
+                            clientLog.setServerExceptionStr(serverLog.getServerExceptionStr());
                         }
                     }
                     logVO.addTimeLine(rpcVO.getValue().getStartDate(), rpcVO.getValue().getCost());
diff --git a/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js b/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js
index 61920c4ff..7f6ba16c8 100644
--- a/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js
+++ b/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js
@@ -1,16 +1,22 @@
 function changeData(data) {
     var result = {
         traceTree: {
+            traceId: "",
             totalTime: 0,
             beginTime: 0,
             endTime: 0,
+            totalSize: 0,
             treeNodes: []
         }
     };
+    result.traceTree.traceId = data.traceId;
     result.traceTree.totalTime = data.endTime - data.beginTime;
     var totalTime = result.traceTree.totalTime;
     result.traceTree.startTime = data.beginTime;
     result.traceTree.endTime = data.endTime;
+    result.traceTree.totalSize = data.nodes.length;
+    result.traceTree.startTimeStr = convertDate(new Date(result.traceTree.startTime));
+    result.traceTree.callIP = data.nodes[0].address;
     var tmpNode;
     for (var i = 0; i < data.nodes.length; i++) {
         tmpNode = data.nodes[i];
@@ -108,4 +114,14 @@ function loadTraceTreeData(baseUrl) {
             $("#alertMessageBox").show();
         }
     });
+}
+
+function convertDate(date) {
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;    //js从0开始取
+    var date1 = date.getDate();
+    var hour = date.getHours();
+    var minutes = date.getMinutes();
+    var second = date.getSeconds();
+    return year + "年" + month + "月" + date1 + "日" + hour + "时" + minutes + "分" + second + "秒";
 }
\ No newline at end of file
diff --git a/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl b/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl
index 22b054894..de22156b9 100644
--- a/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl
+++ b/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl
@@ -84,8 +84,9 @@
                         <li class="list-group-item"><strong>异常堆栈：</strong>
                             {{if　exceptionStack}}
                                 {{>exceptionStack}}
-                            {{else}}
-                                无
+                            {{/if}}
+                            {{if serverExceptionStr}}
+                                <br/>服务端异常堆栈:{{>serverExceptionStr}}
                             {{/if}}
                         </li>
                     </ul>
@@ -98,6 +99,12 @@
 </#macro>
 <#macro traceTreeAllTmpl>
 <script type="text/x-jsrender" id="traceTreeAllTmpl">
+        <div class="row">
+            <h5>
+                {{>traceId}}</br>
+                调度入口IP：{{>callIP}}，开始时间：{{>startTimeStr}}，{{>totalSize}}条调用记录，消耗总时长：{{>totalTime}}ms。
+            </h5>
+        </div>
         <ul id="myTab" class="nav nav-tabs">
             <li class="active">
                 <a href="#traceTree" data-toggle="tab">