Use jmxTreeUpdated event to trigger auto reload of apps in jboss

hawtio · Apr 18, 2013 · 8abf239 · 8abf239
1 parent 0bf4027
commit 8abf239
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/hawtio-web/src/main/webapp/app/jboss/js/connectors.ts b/hawtio-web/src/main/webapp/app/jboss/js/connectors.ts
@@ -72,11 +72,14 @@ module JBoss {
           Core.$apply($scope);
         };
 
-        $scope.$watch('workspace.tree', function () {
-          // if the JMX tree is reloaded its probably because a new MBean has been added or removed
-          // so lets reload, asynchronously just in case
-          setTimeout(loadData, 50);
-        });
+      $scope.$on('jmxTreeUpdated', reloadFunction);
+      $scope.$watch('workspace.tree', reloadFunction);
+
+      function reloadFunction() {
+        // if the JMX tree is reloaded its probably because a new MBean has been added or removed
+        // so lets reload, asynchronously just in case
+        setTimeout(loadData, 50);
+      }
 
         function loadData() {
           console.log("Loading JBoss connector data...");

diff --git a/hawtio-web/src/main/webapp/app/jboss/js/jboss.ts b/hawtio-web/src/main/webapp/app/jboss/js/jboss.ts
@@ -125,11 +125,14 @@ module JBoss {
           //console.log("got response: " + response);
         };
 
-        $scope.$watch('workspace.tree', function () {
-            // if the JMX tree is reloaded its probably because a new MBean has been added or removed
-            // so lets reload, asynchronously just in case
-            setTimeout(loadData, 50);
-        });
+      $scope.$on('jmxTreeUpdated', reloadFunction);
+      $scope.$watch('workspace.tree', reloadFunction);
+
+      function reloadFunction() {
+        // if the JMX tree is reloaded its probably because a new MBean has been added or removed
+        // so lets reload, asynchronously just in case
+        setTimeout(loadData, 50);
+      }
 
         function loadData() {
             console.log("Loading JBoss webapp data...");

diff --git a/hawtio-web/src/main/webapp/app/tomcat/js/sessions.ts b/hawtio-web/src/main/webapp/app/tomcat/js/sessions.ts
@@ -140,11 +140,14 @@ module Tomcat {
           Core.$apply($scope);
         };
 
-        $scope.$watch('workspace.tree', function () {
-          // if the JMX tree is reloaded its probably because a new MBean has been added or removed
-          // so lets reload, asynchronously just in case
-          setTimeout(loadData, 50);
-        });
+      $scope.$on('jmxTreeUpdated', reloadFunction);
+      $scope.$watch('workspace.tree', reloadFunction);
+
+      function reloadFunction() {
+        // if the JMX tree is reloaded its probably because a new MBean has been added or removed
+        // so lets reload, asynchronously just in case
+        setTimeout(loadData, 50);
+      }
 
         function loadData() {
           console.log("Loading tomcat session data...");