Skip to content

Commit

Permalink
remove connection if send fail
Browse files Browse the repository at this point in the history
  • Loading branch information
TATAUFO committed Feb 15, 2020
1 parent 7cb3f32 commit 2d02b7d
Showing 1 changed file with 13 additions and 18 deletions.
31 changes: 13 additions & 18 deletions peer/peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@ func (p *Peer) Connected() bool {
return false
}

func (p *Peer) send(wave galaxy.Wave) error {
_, err := galaxy.SendWave(p.Conn, wave)
if err != nil {
p.Conn = nil
return err
}
return nil
}

// SendQuestion is used to send question to peer
func (p *Peer) SendQuestion(cmd string, args ...interface{}) error {
if !p.Connected() {
Expand All @@ -97,11 +106,7 @@ func (p *Peer) SendQuestion(cmd string, args ...interface{}) error {
Cmd: cmd,
Args: newArgs,
}
_, err = galaxy.SendWave(p.Conn, wave)
if err != nil {
return err
}
return nil
return p.send(wave)
}

func (p Peer) buildArgs(args ...interface{}) (result [][]byte, err error) {
Expand Down Expand Up @@ -150,10 +155,7 @@ func (p *Peer) SendMsgs(msgs []*core.Message) error {
wave := &galaxy.WaveMessages{
Msgs: msgsB,
}
if _, err := galaxy.SendWave(p.Conn, wave); err != nil {
return err
}
return nil
return p.send(wave)
}

// SendPeers is used to send peers of local node
Expand All @@ -169,10 +171,7 @@ func (p *Peer) SendPeers(pm map[common.Hash]*Peer) error {
wave := &galaxy.WavePeers{
Peers: targetPeers,
}
if _, err := galaxy.SendWave(p.Conn, wave); err != nil {
return err
}
return nil
return p.send(wave)
}

// SendRoots is used to send 2 roots to peer
Expand All @@ -187,11 +186,7 @@ func (p *Peer) SendRoots(user0, user1 *core.User) error {
Users: users,
}

_, err := galaxy.SendWave(p.Conn, wave)
if err != nil {
return err
}
return nil
return p.send(wave)
}

// origin used when peer dial
Expand Down

0 comments on commit 2d02b7d

Please sign in to comment.