Add new service.DRAINING status

Author: mihaitodor

healthy/healthy.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/Nitro/sidecar/service"
-	log "github.com/sirupsen/logrus"
 	"github.com/relistan/go-director"
+	log "github.com/sirupsen/logrus"
 )
 
 const (

receiver/http_test.go

@@ -105,7 +105,7 @@ func Test_updateHandler(t *testing.T) {
 			So(received, ShouldBeTrue)
 		})
 
-		Convey("enqueus all updates if no Subscriptions are provided", func() {
+		Convey("enqueues all updates if no Subscriptions are provided", func() {
 			evtState := deepcopy.Copy(state).(*catalog.ServicesState)
 			evtState.LastChanged = time.Now().UTC()
 
@@ -223,5 +223,33 @@ func Test_updateHandler(t *testing.T) {
 			So(lastReceivedState.LastChanged.Before(state.LastChanged), ShouldBeTrue)
 			So(len(lastReceivedState.Servers["chaucer"].Services), ShouldEqual, 2)
 		})
+
+		Convey("enqueues an update to mark a service as DRAINING", func() {
+			evtState := deepcopy.Copy(state).(*catalog.ServicesState)
+			evtState.LastChanged = time.Now().UTC()
+
+			change := catalog.StateChangedEvent{
+				State: evtState,
+				ChangeEvent: catalog.ChangeEvent{
+					Service: service.Service{
+						Name:    "nobody-wants-this",
+						ID:      "10101010101",
+						Updated: time.Now().UTC(),
+						Created: time.Now().UTC(),
+						Status:  service.DRAINING,
+					},
+					PreviousStatus: service.ALIVE,
+				},
+			}
+
+			encoded, _ := json.Marshal(change)
+			req := httptest.NewRequest("POST", "/update", bytes.NewBuffer(encoded))
+
+			UpdateHandler(recorder, req, rcvr)
+			resp := recorder.Result()
+
+			So(resp.StatusCode, ShouldEqual, 200)
+			So(len(rcvr.ReloadChan), ShouldEqual, 1)
+		})
 	})
 }

receiver/receiver.go

@@ -57,6 +57,8 @@ func ShouldNotify(oldStatus int, newStatus int) bool {
 		if oldStatus == service.ALIVE {
 			return true
 		}
+	case service.DRAINING:
+		return true
 	default:
 		log.Errorf("Got unknown service change status: %d", newStatus)
 		return false

service/service.go

@@ -19,6 +19,7 @@ const (
 	TOMBSTONE = iota
 	UNHEALTHY = iota
 	UNKNOWN   = iota
+	DRAINING  = iota
 )
 
 type Port struct {
@@ -162,6 +163,8 @@ func StatusString(status int) string {
 		return "Unhealthy"
 	case UNKNOWN:
 		return "Unknown"
+	case DRAINING:
+		return "Draining"
 	default:
 		return "Tombstone"
 	}

ui/app/services/services.js

@@ -12,13 +12,13 @@ angular.module('sidecar.services', ['ngRoute', 'ui.bootstrap'])
 .factory('stateService', function($http, $q) {
 	function svcGetServices() {
       return $http({
-        method: 'GET', 
+        method: 'GET',
         url: '/api/services.json',
 		dataType: 'json',
       });
     };
 
-	var haproxyUrl = window.location.protocol + 
+	var haproxyUrl = window.location.protocol +
 		'//' + window.location.hostname +
 		':3212/;csv;norefresh';
 
@@ -185,7 +185,7 @@ angular.module('sidecar.services', ['ngRoute', 'ui.bootstrap'])
 				ports.push(port.Port.toString())
 			}
 		}
-	
+
 		return ports.join(", ")
 	};
 })
@@ -199,6 +199,8 @@ angular.module('sidecar.services', ['ngRoute', 'ui.bootstrap'])
 	        return "Unhealthy"
 	    case 3:
 	        return "Unknown"
+	    case 4:
+	        return "Draining"
 	    default:
 	        return "Tombstone"
 	    }
@@ -218,9 +220,9 @@ angular.module('sidecar.services', ['ngRoute', 'ui.bootstrap'])
 		if (seconds > 630720000) { // More than 20 years ago
 			return "never";
 		}
-	
+
 	    var interval = Math.floor(seconds / 31536000);
-	
+
 	    if (interval > 1) {
 	        return interval + " years ago";
 	    }
@@ -275,11 +277,11 @@ if ( ! Array.prototype.groupBy) {
     this.forEach(function(o) {
       var group = JSON.stringify(f(o));
       groups[group] = groups[group] || [];
-      groups[group].push(o);  
+      groups[group].push(o);
     });
-    
+
     return Object.keys(groups).map(function (group) {
-      return groups[group]; 
-    }); 
-  }; 
+      return groups[group];
+    });
+  };
 }