diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/monitor/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/monitor/Handler.java index b45177107579af8acc774c234fd6949f9f0a922d..b04f4dc77ae7bcd129d9a3185dd8ca871ffb4c42 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/monitor/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/monitor/Handler.java @@ -96,6 +96,7 @@ public class Handler implements PageHandler { Metric metric = Cat.getProducer().newMetric(group, key); DefaultMetric defaultMetric = (DefaultMetric) metric; + if (defaultMetric != null) { defaultMetric.setTimestamp(time); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/monitor/Payload.java b/cat-home/src/main/java/com/dianping/cat/report/page/monitor/Payload.java index 164e3a48ee84684a550db3c75125e160c12747b1..77d2edcb6d6c38672afc9827bff6652d6637af7f 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/monitor/Payload.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/monitor/Payload.java @@ -123,9 +123,6 @@ public class Payload extends AbstractReportPayload { if (m_action == null) { m_action = Action.COUNT_API; } - if(m_type == null) { - m_type = "network"; - } } } diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/exceptionAlert/ExceptionAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/exceptionAlert/ExceptionAlert.java index 1bb937b33304de071231923c12065bf62419acb3..1745e50e526bc3c0c4330423058a4ff0ed4518fd 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/exceptionAlert/ExceptionAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/exceptionAlert/ExceptionAlert.java @@ -66,6 +66,7 @@ public class ExceptionAlert implements Task, LogEnabled { private TopMetric buildTopMetric(Date date) { TopReport topReport = queryTopReport(date); TopMetric topMetric = new TopMetric(ALERT_PERIOD, Integer.MAX_VALUE, m_configManager); + topMetric.setStart(date).setEnd(new Date(date.getTime() + TimeUtil.ONE_MINUTE)); topMetric.visitTopReport(topReport); return topMetric; @@ -149,7 +150,6 @@ public class ExceptionAlert implements Task, LogEnabled { for (List item : items) { for (Item i : item) { String domain = i.getDomain(); - ExceptionLimit totalExceptionLimit = m_configManager.queryDomainTotalLimit(domain); int totalWarnLimit = -1; int totalErrorLimit = -1;