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

Bug on Format date

Browse Source
This commit is contained in:
mr 2024-08-22 12:29:38 +02:00
parent d766e3a7c3
commit 1d3620845d
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
models/peer/peer_cache.go
View File

@ -40,25 +40,31 @@ func (p *PeerCache) checkPeerStatus(peerID string, caller *tools.HTTPCaller) boo
if code != 200 { if code != 200 {
return false return false
} }
url := res.(*Peer).Url
if strings.Contains(url, "localhost") || strings.Contains(url, "127.0.0.1") {
url = strings.ReplaceAll(url, "localhost", utils.PEER.API())
url = strings.ReplaceAll(url, "127.0.0.1", utils.PEER.API())
}
methods := caller.URLS[utils.PEER.String()] methods := caller.URLS[utils.PEER.String()]
fmt.Println("checkPeerStatus AFT 3", url, methods) fmt.Println("checkPeerStatus AFT 3", methods)
if methods == nil { if methods == nil {
return false return false
} }
meth := methods[tools.POST] meth := methods[tools.POST]
fmt.Println("checkPeerStatus AFT 4", meth) fmt.Println("checkPeerStatus AFT 4", meth)
if meth == "" { if meth == "" {
return false return false
} }
state := api.CheckRemotePeer(url + meth) url := res.(*Peer).Url + meth
fmt.Println("checkPeerStatus AFT 4", state) if strings.Contains(url, "localhost") || strings.Contains(url, "127.0.0.1") {
url = strings.ReplaceAll(url, "localhost", utils.PEER.API())
url = strings.ReplaceAll(url, "127.0.0.1", utils.PEER.API())
r := regexp.MustCompile("(:[0-9]+)")
ttt := r.FindAllString(url, -1)
for _, t := range ttt {
url = strings.Replace(url, t, ":8080", -1)
}
r.ReplaceAllString(url, ":8080")
}
fmt.Println("checkPeerStatus AFT 4", url)
state := api.CheckRemotePeer(url)
fmt.Println("checkPeerStatus AFT 4", state, tools.DEAD)
return state != tools.DEAD return state != tools.DEAD
} }
@ -91,7 +97,7 @@ func (p *PeerCache) LaunchPeerExecution(peerID string, isMySelf bool, dataID str
return nil, errors.New("no path found") return nil, errors.New("no path found")
} }
if !p.checkPeerStatus(peerID, caller) { if !p.checkPeerStatus(peerID, caller) {
return nil, err return nil, errors.New("peer is not reachable")
} }
if method == tools.POST { if method == tools.POST {
b, err = caller.CallPost(url, methods[method], body) b, err = caller.CallPost(url, methods[method], body)