jiulinxiri/rocketmq-dashboard
1
0
Fork 0
mirror of https://github.com/apache/rocketmq-dashboard.git synced 2025-09-12 13:39:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:apache/rocketmq-externals

Browse Source
This commit is contained in:
vongosling
2020-07-28 20:21:16 +08:00
parent 626aeaed25 018512e7db
commit 6b0ddb41b0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/apache/rocketmq/console/task/DashboardCollectTask.java
View File

@@ -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<String> 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);
}
}
}

4
src/main/resources/static/src/controller.js
View File

@@ -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 = {