diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/RealtimeConsumer.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/RealtimeConsumer.java index c468c691b39300d1f07af0c2904c11c6512f6215..1e2e89b79e8600e98cca8378c75a5abf0995d4ab 100644 --- a/cat-consumer/src/main/java/com/dianping/cat/consumer/RealtimeConsumer.java +++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/RealtimeConsumer.java @@ -345,7 +345,6 @@ public class RealtimeConsumer extends ContainerHolder implements MessageConsumer } else if (value > 0) { startPeriod(value); } else { - endPeriod(-value); // last period is over,make it asynchronous Threads.forGroup("Cat").start(new EndTaskThread(-value)); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/spi/ReportFacade.java b/cat-home/src/main/java/com/dianping/cat/report/task/spi/ReportFacade.java index 0dc447d32275c208a0598ee4d94ceb9ac1c2d413..ff53635b3dbcc26db2b20dee7297acb9c0aaeb0f 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/spi/ReportFacade.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/spi/ReportFacade.java @@ -42,14 +42,6 @@ import com.dianping.cat.report.task.utilization.UtilizationReportBuilder; public class ReportFacade implements LogEnabled, Initializable { - public static final int TYPE_HOUR = ReportType.HOUR; - - public static final int TYPE_DAILY = ReportType.DAILY; - - public static final int TYPE_WEEK = ReportType.WEEK; - - public static final int TYPE_MONTH = ReportType.MONTH; - @Inject private EventReportBuilder m_eventBuilder; @@ -84,10 +76,10 @@ public class ReportFacade implements LogEnabled, Initializable { private DependencyReportBuilder m_dependendcyReportBuilder; @Inject - private MetricBaselineReportBuilder m_metricBaselineReportBuilder; - - @Inject - private ABTestReportBuilder m_abtestReportBuilder; + private MetricBaselineReportBuilder m_metricBaselineReportBuilder; + + @Inject + private ABTestReportBuilder m_abtestReportBuilder; @Inject private HeavyReportBuilder m_heavyReportBuilder; @@ -120,13 +112,13 @@ public class ReportFacade implements LogEnabled, Initializable { } else { boolean result = false; - if (type == TYPE_HOUR) { + if (type == ReportType.HOUR) { result = reportBuilder.buildHourlyTask(reportName, reportDomain, reportPeriod); - } else if (type == TYPE_DAILY) { + } else if (type == ReportType.DAILY) { result = reportBuilder.buildDailyTask(reportName, reportDomain, reportPeriod); - } else if (type == TYPE_WEEK) { + } else if (type == ReportType.WEEK) { result = reportBuilder.buildWeeklyTask(reportName, reportDomain, reportPeriod); - } else if (type == TYPE_MONTH) { + } else if (type == ReportType.MONTH) { result = reportBuilder.buildMonthlyTask(reportName, reportDomain, reportPeriod); } if (result) { @@ -164,7 +156,7 @@ public class ReportFacade implements LogEnabled, Initializable { m_reportBuilders.put(StateAnalyzer.ID, m_stateReportBuilder); m_reportBuilders.put(DependencyAnalyzer.ID, m_dependendcyReportBuilder); m_reportBuilders.put(MetricAnalyzer.ID, m_metricBaselineReportBuilder); - + m_reportBuilders.put(Constants.REPORT_BUG, m_bugReportBuilder); m_reportBuilders.put(Constants.REPORT_SERVICE, m_serviceReportBuilder); m_reportBuilders.put(Constants.REPORT_HEAVY, m_heavyReportBuilder);