Fix #13

hawtio · Sep 17, 2013 · 23c1e74 · 23c1e74
1 parent 4d43244
commit 23c1e74
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/hawtio-web/src/main/webapp/app/core/js/corePlugin.ts b/hawtio-web/src/main/webapp/app/core/js/corePlugin.ts
@@ -116,6 +116,14 @@ angular.module('hawtioCore', ['bootstrap', 'ngResource', 'ui', 'ui.bootstrap.dia
             xhr: null
           };
         }).
+        factory('jolokiaParams', function(jolokiaUrl) {
+          return {
+            url: jolokiaUrl,
+            canonicalNaming: false,
+            ignoreErrors: true,
+            mimeType: 'application/json'
+          };
+        }).
 
         factory('branding', function() {
           return {
@@ -140,12 +148,11 @@ angular.module('hawtioCore', ['bootstrap', 'ngResource', 'ui', 'ui.bootstrap.dia
 
         }).
 
-        factory('jolokia',($location:ng.ILocationService, localStorage, jolokiaStatus, $rootScope, userDetails) => {
+        factory('jolokia',($location:ng.ILocationService, localStorage, jolokiaStatus, $rootScope, userDetails, jolokiaParams) => {
           // TODO - Maybe have separate URLs or even jolokia instances for loading plugins vs. application stuff
           // var jolokiaUrl = $location.search()['url'] || url("/jolokia");
           console.log("Jolokia URL is " + jolokiaUrl);
           if (jolokiaUrl) {
-            var jolokiaParams = {url: jolokiaUrl, canonicalNaming: false, ignoreErrors: true, mimeType: 'application/json'};
 
             var credentials = hawtioPluginLoader.getCredentials(jolokiaUrl);
             // pass basic auth credentials down to jolokia if set

diff --git a/hawtio-web/src/main/webapp/app/jmx/js/charts.ts b/hawtio-web/src/main/webapp/app/jmx/js/charts.ts
@@ -1,14 +1,19 @@
 module Jmx {
-  export function ChartController($scope, $element, $location, workspace:Workspace, jolokia, localStorage) {
+  export function ChartController($scope, $element, $location, workspace:Workspace, localStorage, jolokiaUrl, jolokiaParams) {
+
 
     $scope.metrics = [];
-    $scope.updateRate = parseInt(localStorage['updateRate']);
+    $scope.updateRate = 1000; //parseInt(localStorage['updateRate']);
+
+    var jolokia = new Jolokia(jolokiaParams);
+    jolokia.start($scope.updateRate);
 
     // lets disable as it causes 2 events which
     // cause double charts
     var watchRouteChange = false;
 
     $scope.$on('$destroy', function () {
+      jolokia = null;
       if (watchRouteChange) {
         $scope.deregRouteChange();
       }