Use c.id shorthand instead of c.host.ID()
License: MIT Signed-off-by: Hector Sanjuan <hector@protocol.ai>
This commit is contained in:
parent
c04df7ecf3
commit
f935eb4245
20
cluster.go
20
cluster.go
|
@ -153,7 +153,7 @@ func (c *Cluster) setupConsensus() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
consensus, err := NewConsensus(
|
consensus, err := NewConsensus(
|
||||||
append(startPeers, c.host.ID()),
|
append(startPeers, c.id),
|
||||||
c.host,
|
c.host,
|
||||||
c.config.ConsensusDataFolder,
|
c.config.ConsensusDataFolder,
|
||||||
c.state)
|
c.state)
|
||||||
|
@ -301,7 +301,7 @@ func (c *Cluster) Shutdown() error {
|
||||||
if c.config.LeaveOnShutdown {
|
if c.config.LeaveOnShutdown {
|
||||||
// best effort
|
// best effort
|
||||||
logger.Warning("Attempting to leave Cluster. This may take some seconds")
|
logger.Warning("Attempting to leave Cluster. This may take some seconds")
|
||||||
err := c.consensus.LogRmPeer(c.host.ID())
|
err := c.consensus.LogRmPeer(c.id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("leaving cluster: " + err.Error())
|
logger.Error("leaving cluster: " + err.Error())
|
||||||
} else {
|
} else {
|
||||||
|
@ -354,12 +354,12 @@ func (c *Cluster) ID() api.ID {
|
||||||
ipfsID, _ := c.ipfs.ID()
|
ipfsID, _ := c.ipfs.ID()
|
||||||
var addrs []ma.Multiaddr
|
var addrs []ma.Multiaddr
|
||||||
for _, addr := range c.host.Addrs() {
|
for _, addr := range c.host.Addrs() {
|
||||||
addrs = append(addrs, multiaddrJoin(addr, c.host.ID()))
|
addrs = append(addrs, multiaddrJoin(addr, c.id))
|
||||||
}
|
}
|
||||||
|
|
||||||
return api.ID{
|
return api.ID{
|
||||||
ID: c.host.ID(),
|
ID: c.id,
|
||||||
//PublicKey: c.host.Peerstore().PubKey(c.host.ID()),
|
//PublicKey: c.host.Peerstore().PubKey(c.id),
|
||||||
Addresses: addrs,
|
Addresses: addrs,
|
||||||
ClusterPeers: c.peerManager.peersAddrs(),
|
ClusterPeers: c.peerManager.peersAddrs(),
|
||||||
Version: Version,
|
Version: Version,
|
||||||
|
@ -404,7 +404,7 @@ func (c *Cluster) PeerAdd(addr ma.Multiaddr) (api.ID, error) {
|
||||||
// ensures that it is reachable
|
// ensures that it is reachable
|
||||||
var addrSerial api.MultiaddrSerial
|
var addrSerial api.MultiaddrSerial
|
||||||
err = c.rpcClient.Call(pid, "Cluster",
|
err = c.rpcClient.Call(pid, "Cluster",
|
||||||
"RemoteMultiaddrForPeer", c.host.ID(), &addrSerial)
|
"RemoteMultiaddrForPeer", c.id, &addrSerial)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error(err)
|
logger.Error(err)
|
||||||
id := api.ID{ID: pid, Error: err.Error()}
|
id := api.ID{ID: pid, Error: err.Error()}
|
||||||
|
@ -484,7 +484,7 @@ func (c *Cluster) Join(addr ma.Multiaddr) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bootstrap to myself
|
// Bootstrap to myself
|
||||||
if pid == c.host.ID() {
|
if pid == c.id {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -498,7 +498,7 @@ func (c *Cluster) Join(addr ma.Multiaddr) error {
|
||||||
err = c.rpcClient.Call(pid,
|
err = c.rpcClient.Call(pid,
|
||||||
"Cluster",
|
"Cluster",
|
||||||
"PeerAdd",
|
"PeerAdd",
|
||||||
api.MultiaddrToSerial(multiaddrJoin(c.config.ClusterAddr, c.host.ID())),
|
api.MultiaddrToSerial(multiaddrJoin(c.config.ClusterAddr, c.id)),
|
||||||
&myID)
|
&myID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error(err)
|
logger.Error(err)
|
||||||
|
@ -792,7 +792,7 @@ func (c *Cluster) globalPinInfoCid(method string, h *cid.Cid) (api.GlobalPinInfo
|
||||||
if e := errs[i]; e != nil {
|
if e := errs[i]; e != nil {
|
||||||
if r.Status == api.TrackerStatusBug {
|
if r.Status == api.TrackerStatusBug {
|
||||||
// This error must come from not being able to contact that cluster member
|
// This error must come from not being able to contact that cluster member
|
||||||
logger.Errorf("%s: error in broadcast response from %s: %s ", c.host.ID(), members[i], e)
|
logger.Errorf("%s: error in broadcast response from %s: %s ", c.id, members[i], e)
|
||||||
r = api.PinInfo{
|
r = api.PinInfo{
|
||||||
Cid: r.Cid,
|
Cid: r.Cid,
|
||||||
Peer: members[i],
|
Peer: members[i],
|
||||||
|
@ -841,7 +841,7 @@ func (c *Cluster) globalPinInfoSlice(method string) ([]api.GlobalPinInfo, error)
|
||||||
erroredPeers := make(map[peer.ID]string)
|
erroredPeers := make(map[peer.ID]string)
|
||||||
for i, r := range replies {
|
for i, r := range replies {
|
||||||
if e := errs[i]; e != nil { // This error must come from not being able to contact that cluster member
|
if e := errs[i]; e != nil { // This error must come from not being able to contact that cluster member
|
||||||
logger.Errorf("%s: error in broadcast response from %s: %s ", c.host.ID(), members[i], e)
|
logger.Errorf("%s: error in broadcast response from %s: %s ", c.id, members[i], e)
|
||||||
erroredPeers[members[i]] = e.Error()
|
erroredPeers[members[i]] = e.Error()
|
||||||
} else {
|
} else {
|
||||||
mergePins(r)
|
mergePins(r)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user