显示大纲信息,以及fix #35

This commit is contained in:
ascrutae 2016-04-05 07:48:37 +08:00
parent 9ca5e04436
commit ea638df092
4 changed files with 37 additions and 2 deletions

View File

@ -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;
}
}

View File

@ -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());

View File

@ -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 + "秒";
}

View File

@ -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">