better logs
All checks were successful
Build and Publish / BuildAndDeploy (push) Successful in 1m46s
All checks were successful
Build and Publish / BuildAndDeploy (push) Successful in 1m46s
This commit is contained in:
@@ -343,6 +343,7 @@ func (p *SyncedPool) removeLocalGrain(id CartId) {
|
|||||||
|
|
||||||
func (p *SyncedPool) addRemoteHost(address string, remote *RemoteHost) error {
|
func (p *SyncedPool) addRemoteHost(address string, remote *RemoteHost) error {
|
||||||
known := make([]string, 0, len(p.remotes))
|
known := make([]string, 0, len(p.remotes))
|
||||||
|
|
||||||
for _, r := range p.remotes {
|
for _, r := range p.remotes {
|
||||||
known = append(known, r.Host)
|
known = append(known, r.Host)
|
||||||
if r.Host == address {
|
if r.Host == address {
|
||||||
@@ -364,9 +365,11 @@ func (p *SyncedPool) addRemoteHost(address string, remote *RemoteHost) error {
|
|||||||
}
|
}
|
||||||
log.Printf("Remote %s has %d grains\n", remote.Host, len(ids))
|
log.Printf("Remote %s has %d grains\n", remote.Host, len(ids))
|
||||||
p.mu.Lock()
|
p.mu.Lock()
|
||||||
|
local := 0
|
||||||
|
remoteNo := 0
|
||||||
for _, id := range ids {
|
for _, id := range ids {
|
||||||
if p.local.grains[id] != nil {
|
if p.local.grains[id] != nil {
|
||||||
log.Printf("Grain %s already exists locally, deleting\n", id)
|
local++
|
||||||
delete(p.local.grains, id)
|
delete(p.local.grains, id)
|
||||||
}
|
}
|
||||||
grain, err := NewRemoteGrain(id, remote.Host)
|
grain, err := NewRemoteGrain(id, remote.Host)
|
||||||
@@ -374,10 +377,12 @@ func (p *SyncedPool) addRemoteHost(address string, remote *RemoteHost) error {
|
|||||||
log.Printf("Error creating remote grain %s: %v\n", id, err)
|
log.Printf("Error creating remote grain %s: %v\n", id, err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
remoteNo++
|
||||||
p.remoteIndex[id] = grain
|
p.remoteIndex[id] = grain
|
||||||
}
|
}
|
||||||
|
log.Printf("Removed %d local grains, added %d remote grains\n", local, remoteNo)
|
||||||
p.mu.Unlock()
|
p.mu.Unlock()
|
||||||
p.Negotiate(known)
|
go p.Negotiate(known)
|
||||||
}()
|
}()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user