diff --git a/src/main/java/org/apache/rocketmq/console/task/DashboardCollectTask.java b/src/main/java/org/apache/rocketmq/console/task/DashboardCollectTask.java index db1fbc4..78ad715 100644 --- a/src/main/java/org/apache/rocketmq/console/task/DashboardCollectTask.java +++ b/src/main/java/org/apache/rocketmq/console/task/DashboardCollectTask.java @@ -74,7 +74,7 @@ public class DashboardCollectTask { return; } Date date = new Date(); - Stopwatch stopwatch = Stopwatch.createStarted(); + Stopwatch stopwatch = Stopwatch.createUnstarted(); try { TopicList topicList = mqAdminExt.fetchAllTopicList(); Set topicSet = topicList.getTopicList(); @@ -104,12 +104,13 @@ public class DashboardCollectTask { BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, BrokerStatsManager.TOPIC_PUT_NUMS, topic); stopwatch.stop(); log.info("stop time : {}", stopwatch.toString()); - stopwatch.reset(); + inTPS += bsd.getStatsMinute().getTps(); inMsgCntToday += StatsAllSubCommand.compute24HourSum(bsd); } catch (Exception e) { -// throw Throwables.propagate(e); + stopwatch.reset(); + log.error("Exception caught: mqAdminExt get broker stats data TOPIC_PUT_NUMS failed", e); } } } @@ -127,7 +128,7 @@ public class DashboardCollectTask { outMsgCntToday += StatsAllSubCommand.compute24HourSum(bsd); } catch (Exception e) { -// throw Throwables.propagate(e); + log.error("Exception caught: mqAdminExt get broker stats data GROUP_GET_NUMS failed", e); } } } diff --git a/src/main/resources/static/src/controller.js b/src/main/resources/static/src/controller.js index cd4c295..4a0c359 100644 --- a/src/main/resources/static/src/controller.js +++ b/src/main/resources/static/src/controller.js @@ -288,7 +288,7 @@ app.controller('dashboardCtrl', ['$scope','$rootScope','$translate','$filter','N } var getBrokerBarChartOp = function(xAxisData,data){ - // 指定图表的配置项和数据 + var option = { xAxis: { data: xAxisData, @@ -477,7 +477,7 @@ app.controller('dashboardCtrl', ['$scope','$rootScope','$translate','$filter','N if(flag){ xAxisData.push($filter('date')(tpsArray[0], "HH:mm:ss")); } - _tps.push(tpsArray[3]); + _tps.push(tpsArray[2]); }) flag = false; var _series = {