提交 fcd33781 编写于 作者: F Frankie Wu

small adjustment within logview

上级 8ec299b4
......@@ -140,10 +140,9 @@ public class HtmlMessageCodec implements MessageCodec, Initializable {
long durationInMillis = durationInMicro / 1000L;
if (durationInMicro < 100L) {
count += helper.write(buf, "0");
count += helper.write(buf, String.format("%.2f", durationInMicro / 1000.0));
} else if (durationInMicro < 10000L) { // less than 10 ms
count += helper.write(buf, Long.toString(durationInMillis) + "."
+ (int) ((durationInMicro - durationInMillis * 1000L) / 100L));
count += helper.write(buf, String.format("%.2f", durationInMicro / 1000.0));
} else { // no fraction
count += helper.write(buf, Long.toString(durationInMillis));
}
......
......@@ -29,7 +29,7 @@ public class WaterfallMessageCodec implements MessageCodec, Initializable {
private BufferHelper m_bufferHelper;
private boolean m_mockMode = false;
private boolean m_mockMode = true;
protected int countTransactions(Transaction t) {
int count = 1;
......@@ -157,7 +157,7 @@ public class WaterfallMessageCodec implements MessageCodec, Initializable {
int rw = ruler.calcX(d) - ruler.getOffsetX();
b.tag("rect", "x", rx + 1, "y", y - 15, "width", rw, "height", height - 2, "fill", "#0066ff", "opacity", "0.5");
b.tagWithText("text", String.format("%.3f %s", t.getDurationInMicros() / 1000.0, t.getName()), "x", rx + 5, "y", y - 3,
b.tagWithText("text", String.format("%.2f %s", t.getDurationInMicros() / 1000.0, t.getName()), "x", rx + 5, "y", y - 3,
"font-size", "11", "stroke-width", "0");
int count = helper.write(buf, sb.toString());
......
......@@ -175,8 +175,8 @@ public class HtmlMessageCodecTest extends ComponentTestCase {
+ "<tr><td>&nbsp;&nbsp;A15:33:41.987</td><td>Service</td><td>Auth</td><td>&nbsp;</td><td>20ms userId=1357&amp;token=...</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;t15:33:42.009</td><td>Cache</td><td>findReviewByPK</td><td></td><td></td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;E15:33:42.009</td><td>CacheHost</td><td>host-1</td><td>&nbsp;</td><td>ip=192.168.8.123</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;T15:33:42.010</td><td>Cache</td><td>findReviewByPK</td><td class=\"error\">Missing</td><td>1.0ms 2468</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;A15:33:42.012</td><td>DAL</td><td>findReviewByPK</td><td>&nbsp;</td><td>5.0ms select title,content from Review where id = ?</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;T15:33:42.010</td><td>Cache</td><td>findReviewByPK</td><td class=\"error\">Missing</td><td>1.00ms 2468</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;A15:33:42.012</td><td>DAL</td><td>findReviewByPK</td><td>&nbsp;</td><td>5.00ms select title,content from Review where id = ?</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;E15:33:42.027</td><td>URL</td><td>View</td><td>&nbsp;</td><td>view=HTML</td></tr>\r\n"
+ "<tr><td>T15:33:42.087</td><td>URL</td><td>Review</td><td>&nbsp;</td><td>100ms /review/2468</td></tr>\r\n");
}
......@@ -206,10 +206,10 @@ public class HtmlMessageCodecTest extends ComponentTestCase {
+ "<tr><td>&nbsp;&nbsp;A15:33:41.987</td><td>Service</td><td>Auth</td><td>&nbsp;</td><td>20ms userId=1357&amp;token=...</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;t15:33:42.009</td><td>Cache</td><td>findReviewByPK</td><td></td><td></td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;E15:33:42.009</td><td>CacheHost</td><td>host-1</td><td>&nbsp;</td><td>ip=192.168.8.123</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;T15:33:42.010</td><td>Cache</td><td>findReviewByPK</td><td class=\"error\">Missing</td><td>1.0ms 2468</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;T15:33:42.010</td><td>Cache</td><td>findReviewByPK</td><td class=\"error\">Missing</td><td>1.00ms 2468</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;E15:33:42.010</td><td>Service</td><td>ReviewService</td><td>&nbsp;</td><td>request data</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;<a href=\"/cat/r/m/domain1-c0a83f99-135bdb7825c-1\" onclick=\"return show(this,'domain1-c0a83f99-135bdb7825c-1');\">[:: show ::]</a></td><td colspan=\"4\"><div id=\"domain1-c0a83f99-135bdb7825c-1\"></div></td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;A15:33:42.012</td><td>DAL</td><td>findReviewByPK</td><td>&nbsp;</td><td>5.0ms select title,content from Review where id = ?</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;A15:33:42.012</td><td>DAL</td><td>findReviewByPK</td><td>&nbsp;</td><td>5.00ms select title,content from Review where id = ?</td></tr>\r\n"
+ "<tr><td>&nbsp;&nbsp;E15:33:42.027</td><td>URL</td><td>View</td><td>&nbsp;</td><td>view=HTML</td></tr>\r\n"
+ "<tr><td>T15:33:42.087</td><td>URL</td><td>Review</td><td>&nbsp;</td><td>100ms /review/2468</td></tr>\r\n");
}
......
......@@ -21,10 +21,10 @@
<c:otherwise>
<c:choose>
<c:when test="${payload.waterfall=='true'}">
<div>&nbsp;&nbsp;<a href="?domain=${model.domain}">HTML version</a>&nbsp;&nbsp;&nbsp;&nbsp;Graph version</div>
<div>&nbsp;&nbsp;<a href="?domain=${model.domain}">Text</a>&nbsp;&nbsp;&nbsp;&nbsp;Graph</div>
</c:when>
<c:otherwise>
<div>&nbsp;&nbsp;HTML version&nbsp;&nbsp;&nbsp;&nbsp;<a href="?domain=${model.domain}&waterfall=true">Graph version</a></div>
<div>&nbsp;&nbsp;Text&nbsp;&nbsp;&nbsp;&nbsp;<a href="?domain=${model.domain}&waterfall=true">Graph</a></div>
</c:otherwise>
</c:choose>
${model.table}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册