Number of endpoints zero'd on SC restart, fixes #20

Author: johnsimons

src/ServicePulse.Host/app/js/custom_checks/customChecks.js

@@ -4,7 +4,7 @@ angular.module('customChecks', [])
     .config(['$routeProvider', function ($routeProvider) {
         $routeProvider.when('/customChecks', { templateUrl: 'js/custom_checks/customChecks.tpl.html', controller: 'CustomChecksCtrl' });
     }])
-    .controller('CustomChecksCtrl', ['$scope', 'serviceControlService', 'streamService', function ($scope, serviceControlService, streamService) {
+    .controller('CustomChecksCtrl', ['$scope', 'serviceControlService', function ($scope, serviceControlService) {
 
         $scope.model = { data: [], total: 0};
         $scope.loadingData = false;

src/ServicePulse.Host/app/js/dashboard/dashboard.js

@@ -29,24 +29,14 @@ angular.module('dashboard', [])
             $scope.model.number_of_failed_messages = message.total;
         });
 
-        streamService.subscribe($scope, 'EndpointFailedToHeartbeat', function() {
-            $scope.model.failing_endpoints++;
-            $scope.model.active_endpoints--;
+        streamService.subscribe($scope, 'TotalEndpointsUpdated', function (message) {
+            $scope.model.failing_endpoints = message.failing;
+            $scope.model.active_endpoints = message.active;
         });
 
-        streamService.subscribe($scope, 'EndpointHeartbeatRestored', function() {
-            $scope.model.failing_endpoints--;
-            $scope.model.active_endpoints++;
-        });
-
-        streamService.subscribe($scope, 'HeartbeatingEndpointDetected', function() {
-            $scope.model.active_endpoints++;
-        });
 
         $scope.$on('$destroy', function () {
-            streamService.unsubscribe($scope, 'EndpointHeartbeatRestored');
-            streamService.unsubscribe($scope, 'HeartbeatingEndpointDetected');
-            streamService.unsubscribe($scope, 'EndpointFailedToHeartbeat');
+            streamService.unsubscribe($scope, 'TotalEndpointsUpdated');
             streamService.unsubscribe($scope, 'TotalErrorMessagesUpdated');
             streamService.unsubscribe($scope, 'TotalCustomCheckUpdated');
         });

src/ServicePulse.Host/app/js/endpoints/endpoints.tpl.html

@@ -11,9 +11,9 @@
 
 <div class="row" ng-repeat="endpoint in model">
     <div class="span5">
-        <div style="margin: 5px;" ng-class="{'alert-success': endpoint.active, 'alert-danger': endpoint.active == false}">
-            <h4>{{endpoint.endpoint}}@{{endpoint.machine}}</h4>
-            <p>Latest heartbeat received: <sp-moment date="{{endpoint.last_sent_at}}" /></p>
+        <div style="margin: 5px;" ng-class="{'alert-success': endpoint.reported_status != 'dead', 'alert-danger': endpoint.reported_status == 'dead'}">
+            <h4>{{endpoint.originating_endpoint.name}}@{{endpoint.originating_endpoint.machine}}</h4>
+            <p>Latest heartbeat received: <sp-moment date="{{endpoint.last_report_at}}" /></p>
         </div>
     </div>
 </div>

src/ServicePulse.Host/app/js/failed_messages/failedMessages.tpl.html

@@ -52,7 +52,7 @@ <h2><i class="fa-icon-envelope"></i><span class="break"></span>Showing {{model.f
         <div class="box-content">
             <div class="btn-toolbar">
                 <button class="btn" ng-click="retrySelected()" ng-disabled="model.selectedIds.length == 0"><i class="icon-repeat"></i> Retry {{model.selectedIds.length}} selected</button>
-                <button class="btn" ng-click="retryAll()" ng-disabled="model.total == 0"><i class="icon-asterisk"></i> Retry all ({{model.total}} messages)</button>
+                <button class="btn" ng-click="retryAll()" ng-disabled="model.total == 0"><i class="icon-asterisk"></i> Retry all messages)</button>
                 <div class="btn-group pull-right">
                     <a class="btn btn-link dropdown-toggle"
                        data-toggle="dropdown"