Merge pull request #103 from neo-technology/1.1-merge-jmx-calls-for-sysinfo

Merge all the calls for sysinfo into one procedure call

Author: oskarhane

app/scripts/controllers/SysinfoController.coffee

@@ -26,6 +26,10 @@ angular.module('neo4jApp.controllers')
   ($scope, Settings, ProtocolFactory, $timeout) ->
     $scope.autoRefresh = false
     $scope.sysinfo = {}
+    $scope.sysinfo.primitives ?= {}
+    $scope.sysinfo.cache ?= { available: false }
+    $scope.sysinfo.tx ?= { available: false }
+    $scope.sysinfo.ha ?= { }
     $scope.refresh = () ->
       # kernel info from JMX
       $scope.sysinfo.kernel ?= {}
@@ -34,70 +38,48 @@ angular.module('neo4jApp.controllers')
           "org.neo4j:instance=kernel#0,name=Configuration"
           "org.neo4j:instance=kernel#0,name=Kernel"
           "org.neo4j:instance=kernel#0,name=Store file sizes"
-        ]).then((response) ->
-          for r in response.data
-            for a in r.attributes
-              $scope.sysinfo.kernel[a.name] = a.value
-        ).catch((r)-> $scope.sysinfo.kernel = {})
-
-      # primitive counts from JMX
-      $scope.sysinfo.primitives ?= {}
-      ProtocolFactory.getJmxService().getJmx(
-        [
           "org.neo4j:instance=kernel#0,name=Primitive count"
-        ]).then((response) ->
-          for r in response.data
-            for a in r.attributes
-              $scope.sysinfo.primitives[a.name] = a.value
-        ).catch((r)-> $scope.sysinfo.primitives = {})
-
-      # page cache data from JMX
-      $scope.sysinfo.cache ?= { available: false }
-      ProtocolFactory.getJmxService().getJmx(
-        [
           "org.neo4j:instance=kernel#0,name=Page cache"
-        ]).then((response) ->
-          for r in response.data
-            $scope.sysinfo.cache.available = true
-            for a in r.attributes
-              $scope.sysinfo.cache[a.name] = a.value
-        ).catch((r)-> $scope.sysinfo.cache = { available: false })
-
-      # transactions from JMX
-      $scope.sysinfo.tx ?= { available: false }
-      ProtocolFactory.getJmxService().getJmx(
-        [
           "org.neo4j:instance=kernel#0,name=Transactions"
-        ]).then((response) ->
-          for r in response.data
-            $scope.sysinfo.tx.available = true
-            for a in r.attributes
-              $scope.sysinfo.tx[a.name] = a.value
-        ).catch((r)-> $scope.sysinfo.tx = {available: false})
-
-      # transactions from JMX
-      $scope.sysinfo.ha ?= { }
-      ProtocolFactory.getJmxService().getJmx(
-        [
           "org.neo4j:instance=kernel#0,name=High Availability"
         ]).then((response) ->
           for r in response.data
-            $scope.sysinfo.ha.clustered = true
-            for a in r.attributes
-              if a.name is "InstancesInCluster"
-                $scope.sysinfo.ha.ClusterMembers = {}
-                for member in a.value
-                  clusterMember = {}
-                  for ma in member.value
-                    clusterMember[ma.name] = ma.value
-                  clusterMember.connected = false
-                  $scope.sysinfo.ha.ClusterMembers[clusterMember.instanceId] = clusterMember
-              else
-                if a.name is "InstanceId"
-                  connectedMemberId = a.value
-                $scope.sysinfo.ha[a.name] = a.value
-            $scope.sysinfo.ha.ClusterMembers[connectedMemberId].connected = true
-        ).catch((r)-> $scope.sysinfo.ha = { clustered: false })
+            if r.name in ["org.neo4j:instance=kernel#0,name=Configuration","org.neo4j:instance=kernel#0,name=Kernel","org.neo4j:instance=kernel#0,name=Store file sizes" ]
+              for a in r.attributes
+                $scope.sysinfo.kernel[a.name] = a.value
+            else if r.name ==  "org.neo4j:instance=kernel#0,name=Primitive count"
+              for a in r.attributes
+                $scope.sysinfo.primitives[a.name] = a.value
+            else if r.name == "org.neo4j:instance=kernel#0,name=Page cache"
+              $scope.sysinfo.cache.available = true
+              for a in r.attributes
+                $scope.sysinfo.cache[a.name] = a.value
+            else if "org.neo4j:instance=kernel#0,name=Transactions"
+              $scope.sysinfo.tx.available = true
+              for a in r.attributes
+                $scope.sysinfo.tx[a.name] = a.value
+            else if  "org.neo4j:instance=kernel#0,name=High Availability"
+              $scope.sysinfo.ha.clustered = true
+              for a in r.attributes
+                if a.name is "InstancesInCluster"
+                  $scope.sysinfo.ha.ClusterMembers = {}
+                  for member in a.value
+                    clusterMember = {}
+                    for ma in member.value
+                      clusterMember[ma.name] = ma.value
+                    clusterMember.connected = false
+                    $scope.sysinfo.ha.ClusterMembers[clusterMember.instanceId] = clusterMember
+                else
+                  if a.name is "InstanceId"
+                    connectedMemberId = a.value
+                  $scope.sysinfo.ha[a.name] = a.value
+              $scope.sysinfo.ha.ClusterMembers[connectedMemberId].connected = true
+        ).catch((r) ->
+          $scope.sysinfo.kernel = {}
+          $scope.sysinfo.primitives = {}
+          $scope.sysinfo.cache = { available: false }
+          $scope.sysinfo.tx = {available: false}
+          $scope.sysinfo.ha = { clustered: false })
 
     timer = null
     refreshLater = () =>