提交 20ac6eb6 编写于 作者: J jialinsun

fix bug

上级 708a2fe6
......@@ -187,12 +187,11 @@ public class HostInfo extends BaseVisitor {
@Override
public void visitRemote(Remote remote) {
// String remoteIp = remote.getId();
String id = remote.getId();
String remoteIp = remote.getIp();
if (remoteIp == null) {
remoteIp = remote.getId();
remoteIp = id;
int index = remoteIp.indexOf(":Caller");
......
......@@ -226,20 +226,17 @@ public class MethodInfo extends BaseVisitor {
@Override
public void visitRemote(Remote remote) {
String role = remote.getRole();
// String ip = remote.getId();
String ip = remote.getIp();
if (ip == null) {
ip = remote.getId();
if (ip.endsWith(":Caller") && role.endsWith("Caller")) {
ip = ip.substring(0, ip.indexOf(":Caller"));
}
}
String app = remote.getApp();
// if (ip.endsWith(":Caller") && role.endsWith("Caller")) {
// ip = ip.substring(0, ip.indexOf(":Caller"));
// }
if (projectContains(m_remoteProject, app, ip, role) || m_remoteIp.equals(ip)) {
m_currentRole = role;
super.visitRemote(remote);
......
......@@ -181,7 +181,7 @@ public class ProjectInfo extends BaseVisitor {
addServiceProject(remoteIp, app, remote.getType());
} else if (role != null && role.endsWith("Server")) {
addCallProject(remoteIp, app, remote.getType());
} else if (role != null && role.endsWith("Caller") && remoteIp.endsWith(":Caller")) {
} else if (role != null && role.endsWith("Caller")) {
addCallerProject(remoteIp, app, remote.getType());
}
}
......
......@@ -77,7 +77,7 @@
<tr class="right">
<td class="left">
<a href="?domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&sort=type"><a href="?op=graphs&domain=${model.domain}&date=${model.date}&type=${item.type}&ip=${model.ipAddress}" class="graph_link" data-status="${status.index}">[:: show ::]</a>
&nbsp;&nbsp;<a href="?domain=${report.domain}&date=${model.date}&ip=${model.ipAddress}&type=${item.type}">${item.type}</a>
&nbsp;&nbsp;<a href="?domain=${report.domain}&date=${model.date}&ip=${model.ipAddress}&type=${item.type}">${item.detail.id}</a>
</td>
<td>${w:format(e.totalCount,'#,###,###,###,##0')}</td>
<td>${w:format(e.failCount,'#,###,###,###,##0')}</td>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册