home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-17 00:36:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

[임대현] [NOBTS] servermap mergeUnknown시 data 재사용으로 변경

Browse Source 
git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@2796 84d0f5b1-2673-498c-a247-62c4ff18d310
This commit is contained in:
Denny Lim
2013-11-06 02:29:26 +00:00
parent d06649ee7e
commit decd232d0f
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/scripts/directives/linkInfoDetails.js
+3 -1
View File
@@ -31,7 +31,9 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', function (co
scope.sourceinfo = null;
scope.showLinkInfoChart = false;
scope.showLinkInfoBarChart = false;
scope.$digest();
if (!scope.$$phase) {
scope.$digest();
}
};
/**
src/main/webapp/scripts/directives/nodeInfoDetails.js
+9 -3
View File
@@ -33,7 +33,9 @@ pinpointApp
scope.agents = null;
scope.showAgents = false;
scope.showNodeInfoBarChart = false;
scope.$digest();
if (!scope.$$phase) {
scope.$digest();
}
};
/**
@@ -54,7 +56,9 @@ pinpointApp
scope.isWas = node.isWas;
// scope.agents = data.agents;
// scope.showAgents = (scope.agents.length > 0) ? true : false;
scope.$digest();
if (!scope.$$phase) {
scope.$digest();
}
};
// var getApplicationStatisticsData = function (query, callback) {
@@ -83,7 +87,9 @@ pinpointApp
*/
renderApplicationStatistics = function (data) {
scope.showNodeInfoBarChart = true;
scope.$digest();
if (!scope.$$phase) {
scope.$digest();
}
nv.addGraph(function () {
var chart = nv.models.discreteBarChart().x(function (d) {
return d.label;
src/main/webapp/scripts/directives/serverMap.js
+13 -4
View File
@@ -118,6 +118,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', '$rootScope', '$window',
});
} else {
getServerMapData(query, function (query, result) {
htLastMapData = result;
serverMapCallback(query, result, mergeUnknowns, linkRouting, linkCurve);
});
}
@@ -750,7 +751,15 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', '$rootScope', '$window',
*/
scope.toggleMergeUnknowns = function () {
scope.mergeUnknowns = (scope.mergeUnknowns) ? false : true;
showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.filter, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve);
var query = {
applicationName: scope.oNavbarDao.getApplicationName(),
serviceType: scope.oNavbarDao.getServiceType(),
from: scope.oNavbarDao.getQueryStartTime(),
to: scope.oNavbarDao.getQueryEndTime(),
period: scope.oNavbarDao.getQueryPeriod(),
filter: scope.oNavbarDao.getFilter()
};
serverMapCallback(query, htLastMapData, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve);
reset();
};
@@ -761,7 +770,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', '$rootScope', '$window',
scope.toggleLinkLableTextType = function (type) {
scope.totalRequestCount = (type !== 'tps') ? true : false;
scope.tps = (type === 'tps') ? true : false;
showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.filter, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve);
showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.oNavbarDao.getFilter(), scope.mergeUnknowns, scope.linkRouting, scope.linkCurve);
reset();
};
@@ -771,7 +780,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', '$rootScope', '$window',
*/
scope.toggleLinkRouting = function (type) {
scope.linkRouting = cfg.options.htLinkType.sRouting = type;
showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.filter, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve);
showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.oNavbarDao.getFilter(), scope.mergeUnknowns, scope.linkRouting, scope.linkCurve);
reset();
};
@@ -781,7 +790,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', '$rootScope', '$window',
*/
scope.toggleLinkCurve = function (type) {
scope.linkCurve = cfg.options.htLinkType.sCurve = type;
showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.filter, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve);
showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.oNavbarDao.getFilter(), scope.mergeUnknowns, scope.linkRouting, scope.linkCurve);
reset();
};