Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
moved the $scope use to the top then all the helper functions near th…
…e bottom
  • Loading branch information
jstrachan committed Apr 18, 2013
1 parent e4561b3 commit 03ff168
Showing 1 changed file with 38 additions and 40 deletions.
78 changes: 38 additions & 40 deletions hawtio-web/src/main/webapp/app/jetty/js/jetty.ts
Expand Up @@ -96,6 +96,18 @@ module Jetty {
$scope.$on('jmxTreeUpdated', reloadFunction);
$scope.$watch('workspace.tree', reloadFunction);

// grab server information once
$scope.jettyServerVersion = "";
$scope.jettyServerStartupTime = "";

var servers = jolokia.search("org.eclipse.jetty.server:type=server,*")
if (servers && servers.length === 1) {
$scope.jettyServerVersion = jolokia.getAttribute(servers[0], "version")
$scope.jettyServerStartupTime = jolokia.getAttribute(servers[0], "startupTime")
} else {
console.log("Cannot find jetty server or there was more than one server. response is: " + servers)
}


function reloadFunction() {
// if the JMX tree is reloaded its probably because a new MBean has been added or removed
Expand All @@ -111,49 +123,35 @@ module Jetty {
jolokia.search("org.eclipse.jetty.servlet:type=servletcontexthandler,*", onSuccess(render));
}

// grab server information once
$scope.jettyServerVersion = "";
$scope.jettyServerStartupTime = "";

var servers = jolokia.search("org.eclipse.jetty.server:type=server,*")
if (servers && servers.length === 1) {
$scope.jettyServerVersion = jolokia.getAttribute(servers[0], "version")
$scope.jettyServerStartupTime = jolokia.getAttribute(servers[0], "startupTime")
} else {
console.log("Cannot find jetty server or there was more than one server. response is: " + servers)
}

}

function render(response) {
$scope.webapps = [];
$scope.mbeanIndex = {};
$scope.selected.length = 0;

function onAttributes(response) {
var obj = response.value;
if (obj) {
obj.mbean = response.request.mbean;
obj.state = obj['running'] === undefined || obj['running'] ? "started" : "stopped"
var mbean = obj.mbean;
if (mbean) {
var idx = $scope.mbeanIndex[mbean];
if (angular.isDefined(idx)) {
$scope.webapps[mbean] = obj;
} else {
$scope.mbeanIndex[mbean] = $scope.webapps.length;
$scope.webapps.push(obj);
function render(response) {
$scope.webapps = [];
$scope.mbeanIndex = {};
$scope.selected.length = 0;

function onAttributes(response) {
var obj = response.value;
if (obj) {
obj.mbean = response.request.mbean;
obj.state = obj['running'] === undefined || obj['running'] ? "started" : "stopped"
var mbean = obj.mbean;
if (mbean) {
var idx = $scope.mbeanIndex[mbean];
if (angular.isDefined(idx)) {
$scope.webapps[mbean] = obj;
} else {
$scope.mbeanIndex[mbean] = $scope.webapps.length;
$scope.webapps.push(obj);
}
Core.$apply($scope);
}
Core.$apply($scope);
}
}
}

angular.forEach(response, function (value, key) {
var mbean = value;
jolokia.request({type: "read", mbean: mbean, attribute: []}, onSuccess(onAttributes));
});
$scope.$apply();
angular.forEach(response, function (value, key) {
var mbean = value;
jolokia.request({type: "read", mbean: mbean, attribute: []}, onSuccess(onAttributes));
});
$scope.$apply();
}
}

}

0 comments on commit 03ff168

Please sign in to comment.