No discovery needed

tools/api.go

@@ -21,6 +21,10 @@ const (
 	WAITING
 )
 
+func (s State) EnumIndex() int {
+	return int(s)
+}
+
 func ToState(str string) State {
 	for _, s := range []State{ALIVE, REDUCED_SERVICE, UNPROCESSABLE_ENTITY, DB_FALLOUT, TEAPOT, DEAD, WAITING} {
 		if s.String() == str {
@@ -57,39 +61,47 @@ func (a *API) GetState() (State, int, error) {
 	return ALIVE, 200, nil
 }
 
-func (a *API) CheckRemotePeer(url string) State {
+func (a *API) CheckRemotePeer(url string) (State, map[string]int) {
 	// Check if the database is up
 	caller := NewHTTPCaller(map[string]map[METHOD]string{})
 	var resp APIStatusResponse
 	b, err := caller.CallPost(url, "/status", []string{})
 	if err != nil {
-		return DEAD
+		return DEAD, map[string]int{}
 	}
 	json.Unmarshal(b, &resp)
 	if resp.Data == nil {
-		return DEAD
+		return DEAD, map[string]int{}
 	}
-	return ToState(resp.Data.State)
+	new := map[string]int{}
+	for k, v := range resp.Data.Services {
+		new[k] = ToState(v).EnumIndex()
+	}
+	return ToState(resp.Data.State), new
 }
 
-func (a *API) CheckRemoteAPIs(urls []string) (State, int, error) {
+func (a *API) CheckRemoteAPIs(urls []string) (State, map[string]int, error) {
 	// Check if the database is up
+	new := map[string]int{}
 	caller := NewHTTPCaller(map[string]map[METHOD]string{})
 	for _, url := range urls {
 		var resp APIStatusResponse
 		b, err := caller.CallGet(url, "/version/status")
 		if err != nil {
-			return REDUCED_SERVICE, 200, err
+			return REDUCED_SERVICE, new, err
 		}
 		json.Unmarshal(b, &resp)
 		if resp.Data == nil {
-			return DEAD, 200, errors.New(url + " -> is DEAD")
+			return DEAD, new, errors.New(url + " -> is DEAD")
+		}
+		for k, v := range resp.Data.Services {
+			new[k] = ToState(v).EnumIndex()
 		}
 		if resp.Data.Code != 0 {
-			return REDUCED_SERVICE, 200, errors.New(url + " -> " + resp.Error)
+			return REDUCED_SERVICE, new, errors.New(url + " -> " + resp.Error)
 		}
 	}
-	return ALIVE, 200, nil
+	return ALIVE, new, nil
 }
 
 type APIStatusResponse struct {
@@ -98,6 +110,7 @@ type APIStatusResponse struct {
 }
 
 type APIStatus struct {
-	Code  int    `json:"code"`
-	State string `json:"state"`
+	Code     int               `json:"code"`
+	State    string            `json:"state"`
+	Services map[string]string `json:"services"`
 }