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

bug fix.

Browse Source 
- send wrong application name to thread-dump window when select different application with application of url
This commit is contained in:
denz
2017-03-15 14:31:56 +09:00
committed by HyoJong
parent 3afd5be8f6
commit f05079fb11
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/main/webapp/components/server-map2/jquery.ServerMap2.js
+1 -1
View File
@@ -1291,7 +1291,7 @@
htData = node.data,
fOnNodeClicked = this.option('fOnNodeClicked');
if (angular.isFunction(fOnNodeClicked)) {
if ( e.clickCount && e.clickCount > 0 ) {
if ( e && e.clickCount && e.clickCount > 0 ) {
this.analyticsService.send(this.analyticsService.CONST.MAIN, this.analyticsService.CONST.CLK_NODE);
}
fOnNodeClicked.call(this, e, htData, unknownKey, query);
web/src/main/webapp/features/realtimeChart/realtime-chart.controller.js
+10 -4
View File
@@ -62,6 +62,7 @@
var $elSumChartWrapper, $elTitle, $elSumChartCount, $elAgentChartListWrapper, $elWarningMessage, $elPin;
var preUrlParam = "";
var currentApplicationName = "";
var currentServiceType = "";
var aAgentChartElementList = [];
var aChildScopeList = [];
var oNamespaceToIndexMap = {};
@@ -365,12 +366,13 @@
bShowRealtimeChart = prevShowRealtimeChart;
setPinColor();
});
$scope.$on( "realtimeChartController.initialize", function (event, was, applicationName, urlParam ) {
$scope.$on( "realtimeChartController.initialize", function (event, was, applicationName, serviceType, urlParam ) {
hideSub();
if ( bIsPinned === true && preUrlParam === urlParam ) return;
if ( UrlVoService.isRealtime() === false ) return;
bIsWas = angular.isUndefined( was ) ? false : was;
applicationName = angular.isUndefined( applicationName ) ? "" : applicationName;
serviceType = angular.isUndefined( serviceType ) ? "" : serviceType;
preUrlParam = urlParam;
@@ -390,7 +392,9 @@
$scope.bInitialized = true;
// resetStatus();
$elTitle.html( currentApplicationName = applicationName );
currentApplicationName = applicationName;
currentServiceType = serviceType;
$elTitle.html( currentApplicationName );
showPopup();
showWaitingConnectionPopup();
@@ -417,7 +421,7 @@
if (openType === null || openType === "window") {
$window.open(
getOpenUrl() +
"/threadDump/" + preUrlParam.split("/")[0] + "/" + agentId,
"/threadDump/" + currentApplicationName + "@" + currentServiceType + "/" + agentId,
"Thread Dump Info",
"width=1280px,height=800px,menubar=no,toolbar=no,location=no,resizable=yes,scrollbars=no,status=no"
);
@@ -439,7 +443,9 @@
stopReceive();
stopChart();
$elWarningMessage.hide();
$elTitle.html( currentApplicationName = "" );
currentApplicationName = "";
currentServiceType = "";
$elTitle.html( currentApplicationName );
$elSumChartCount.html("0");
}
$($window).on("resize", function() {
web/src/main/webapp/features/serverMap/server-map.directive.js
+1 -1
View File
@@ -353,7 +353,7 @@
htLastNode = node;
scope.$emit("serverMapDirective.nodeClicked", e, htLastQuery, node, htLastMergedMapData, searchQuery);
if ( scope.oNavbarVoService && scope.oNavbarVoService.isRealtime() ) {
$rootScope.$broadcast("realtimeChartController.initialize", node.isWas, node.applicationName, scope.oNavbarVoService.getApplication() + "/" + scope.oNavbarVoService.getReadablePeriod() + "/" + scope.oNavbarVoService.getQueryEndDateTime() + "/" + scope.oNavbarVoService.getCallerRange());
$rootScope.$broadcast("realtimeChartController.initialize", node.isWas, node.applicationName, node.serviceType, scope.oNavbarVoService.getApplication() + "/" + scope.oNavbarVoService.getReadablePeriod() + "/" + scope.oNavbarVoService.getQueryEndDateTime() + "/" + scope.oNavbarVoService.getCallerRange());
}
reset();
};