From 1986143dd0db31ea407c8273743b1ef5a21519ed Mon Sep 17 00:00:00 2001 From: mr Date: Fri, 23 Aug 2024 15:43:12 +0200 Subject: [PATCH] simplify call to peer --- models/peer/peer_cache.go | 1 + tools/api.go | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/models/peer/peer_cache.go b/models/peer/peer_cache.go index 077e4f1..b909d47 100644 --- a/models/peer/peer_cache.go +++ b/models/peer/peer_cache.go @@ -59,6 +59,7 @@ func (p *PeerCache) checkPeerStatus(peerID string, appName string, caller *tools state, services := api.CheckRemotePeer(url) res.(*Peer).Services = services access.UpdateOne(res, peerID) + fmt.Println("PEER AFT 6", state, services, appName) return res.(*Peer), state != tools.DEAD && services[appName] == 0 } diff --git a/tools/api.go b/tools/api.go index 1add8e0..6991acf 100644 --- a/tools/api.go +++ b/tools/api.go @@ -84,6 +84,9 @@ func (a *API) CheckRemoteAPIs(urls map[string]string) (State, map[string]string, // Check if the database is up new := map[string]string{} caller := NewHTTPCaller(map[string]map[METHOD]string{}) + code := 0 + u := "" + e := "" for appName, url := range urls { var resp APIStatusResponse b, err := caller.CallGet(url, "/version/status") @@ -95,10 +98,15 @@ func (a *API) CheckRemoteAPIs(urls map[string]string) (State, map[string]string, return DEAD, new, errors.New(url + " -> is DEAD") } new[appName] = resp.Data.State - if resp.Data.Code != 0 { - return REDUCED_SERVICE, new, errors.New(url + " -> " + resp.Error) + if resp.Data.Code > code { + code = resp.Data.Code + u = url + e += resp.Error } } + if code > 0 { + return REDUCED_SERVICE, new, errors.New(u + " -> " + e) + } return ALIVE, new, nil }