core/oc-lib
5
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

simplify call to peer

Browse Source
This commit is contained in:
mr 2024-08-23 15:43:12 +02:00
parent 5b3779e4cb
commit 1986143dd0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
models/peer/peer_cache.go
View File

@ -59,6 +59,7 @@ func (p *PeerCache) checkPeerStatus(peerID string, appName string, caller *tools
state, services := api.CheckRemotePeer(url) state, services := api.CheckRemotePeer(url)
res.(*Peer).Services = services res.(*Peer).Services = services
access.UpdateOne(res, peerID) access.UpdateOne(res, peerID)
fmt.Println("PEER AFT 6", state, services, appName)
return res.(*Peer), state != tools.DEAD && services[appName] == 0 return res.(*Peer), state != tools.DEAD && services[appName] == 0
} }

12
tools/api.go
View File

@ -84,6 +84,9 @@ func (a *API) CheckRemoteAPIs(urls map[string]string) (State, map[string]string,
// Check if the database is up // Check if the database is up
new := map[string]string{} new := map[string]string{}
caller := NewHTTPCaller(map[string]map[METHOD]string{}) caller := NewHTTPCaller(map[string]map[METHOD]string{})
code := 0
u := ""
e := ""
for appName, url := range urls { for appName, url := range urls {
var resp APIStatusResponse var resp APIStatusResponse
b, err := caller.CallGet(url, "/version/status") 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") return DEAD, new, errors.New(url + " -> is DEAD")
} }
new[appName] = resp.Data.State new[appName] = resp.Data.State
if resp.Data.Code != 0 { if resp.Data.Code > code {
return REDUCED_SERVICE, new, errors.New(url + " -> " + resp.Error) code = resp.Data.Code
u = url
e += resp.Error
} }
} }
if code > 0 {
return REDUCED_SERVICE, new, errors.New(u + " -> " + e)
}
return ALIVE, new, nil return ALIVE, new, nil
} }