From fcd337816aa75f6c978bb87447e3bb5ddf6534ed Mon Sep 17 00:00:00 2001 From: Frankie Wu Date: Mon, 24 Sep 2012 10:20:57 +0800 Subject: [PATCH] small adjustment within logview --- .../dianping/cat/message/spi/codec/HtmlMessageCodec.java | 5 ++--- .../cat/message/spi/codec/WaterfallMessageCodec.java | 4 ++-- .../cat/message/spi/codec/HtmlMessageCodecTest.java | 8 ++++---- cat-home/src/main/webapp/jsp/report/logview.jsp | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java b/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java index 02ba5086f..a0be0752e 100644 --- a/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java +++ b/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java @@ -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)); } diff --git a/cat-core/src/main/java/com/dianping/cat/message/spi/codec/WaterfallMessageCodec.java b/cat-core/src/main/java/com/dianping/cat/message/spi/codec/WaterfallMessageCodec.java index c4ef52d14..f2472a5b8 100644 --- a/cat-core/src/main/java/com/dianping/cat/message/spi/codec/WaterfallMessageCodec.java +++ b/cat-core/src/main/java/com/dianping/cat/message/spi/codec/WaterfallMessageCodec.java @@ -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()); diff --git a/cat-core/src/test/java/com/dianping/cat/message/spi/codec/HtmlMessageCodecTest.java b/cat-core/src/test/java/com/dianping/cat/message/spi/codec/HtmlMessageCodecTest.java index 8b0dee8f4..4dca73892 100644 --- a/cat-core/src/test/java/com/dianping/cat/message/spi/codec/HtmlMessageCodecTest.java +++ b/cat-core/src/test/java/com/dianping/cat/message/spi/codec/HtmlMessageCodecTest.java @@ -175,8 +175,8 @@ public class HtmlMessageCodecTest extends ComponentTestCase { + "  A15:33:41.987ServiceAuth 20ms userId=1357&token=...\r\n" + "  t15:33:42.009CachefindReviewByPK\r\n" + "    E15:33:42.009CacheHosthost-1 ip=192.168.8.123\r\n" - + "  T15:33:42.010CachefindReviewByPKMissing1.0ms 2468\r\n" - + "  A15:33:42.012DALfindReviewByPK 5.0ms select title,content from Review where id = ?\r\n" + + "  T15:33:42.010CachefindReviewByPKMissing1.00ms 2468\r\n" + + "  A15:33:42.012DALfindReviewByPK 5.00ms select title,content from Review where id = ?\r\n" + "  E15:33:42.027URLView view=HTML\r\n" + "T15:33:42.087URLReview 100ms /review/2468\r\n"); } @@ -206,10 +206,10 @@ public class HtmlMessageCodecTest extends ComponentTestCase { + "  A15:33:41.987ServiceAuth 20ms userId=1357&token=...\r\n" + "  t15:33:42.009CachefindReviewByPK\r\n" + "    E15:33:42.009CacheHosthost-1 ip=192.168.8.123\r\n" - + "  T15:33:42.010CachefindReviewByPKMissing1.0ms 2468\r\n" + + "  T15:33:42.010CachefindReviewByPKMissing1.00ms 2468\r\n" + "  E15:33:42.010ServiceReviewService request data\r\n" + "  [:: show ::]
\r\n" - + "  A15:33:42.012DALfindReviewByPK 5.0ms select title,content from Review where id = ?\r\n" + + "  A15:33:42.012DALfindReviewByPK 5.00ms select title,content from Review where id = ?\r\n" + "  E15:33:42.027URLView view=HTML\r\n" + "T15:33:42.087URLReview 100ms /review/2468\r\n"); } diff --git a/cat-home/src/main/webapp/jsp/report/logview.jsp b/cat-home/src/main/webapp/jsp/report/logview.jsp index 61cd18af0..bdd721b71 100755 --- a/cat-home/src/main/webapp/jsp/report/logview.jsp +++ b/cat-home/src/main/webapp/jsp/report/logview.jsp @@ -21,10 +21,10 @@ -
  HTML version    Graph version
+
  Text    Graph
 -
  HTML version    Graph version
+
  Text    Graph
 ${model.table} -- GitLab