diff options
author | Viktor TrĂ³n <viktor.tron@gmail.com> | 2018-09-28 17:04:07 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-28 17:04:07 +0800 |
commit | 0da3b17a112a75b54c8b3e5a2bf65a27a1c8c999 (patch) | |
tree | a8ff65462707ec59c340a93b0a456657b2ab46d6 /swarm/network/stream/messages.go | |
parent | d8d86692716158f9d514dcaa06b69f129d43c3d8 (diff) | |
parent | 86f68cf04f5166848fd44150363866d7faa72b60 (diff) | |
download | dexon-0da3b17a112a75b54c8b3e5a2bf65a27a1c8c999.tar dexon-0da3b17a112a75b54c8b3e5a2bf65a27a1c8c999.tar.gz dexon-0da3b17a112a75b54c8b3e5a2bf65a27a1c8c999.tar.bz2 dexon-0da3b17a112a75b54c8b3e5a2bf65a27a1c8c999.tar.lz dexon-0da3b17a112a75b54c8b3e5a2bf65a27a1c8c999.tar.xz dexon-0da3b17a112a75b54c8b3e5a2bf65a27a1c8c999.tar.zst dexon-0da3b17a112a75b54c8b3e5a2bf65a27a1c8c999.zip |
Merge pull request #17747 from ethersphere/max-stream-peer-servers
Add stream peer servers limit
Diffstat (limited to 'swarm/network/stream/messages.go')
-rw-r--r-- | swarm/network/stream/messages.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/swarm/network/stream/messages.go b/swarm/network/stream/messages.go index 117f88044..74c785d58 100644 --- a/swarm/network/stream/messages.go +++ b/swarm/network/stream/messages.go @@ -84,11 +84,13 @@ func (p *Peer) handleSubscribeMsg(ctx context.Context, req *SubscribeMsg) (err e defer func() { if err != nil { - if e := p.Send(context.TODO(), SubscribeErrorMsg{ + // The error will be sent as a subscribe error message + // and will not be returned as it will prevent any new message + // exchange between peers over p2p. Instead, error will be returned + // only if there is one from sending subscribe error message. + err = p.Send(context.TODO(), SubscribeErrorMsg{ Error: err.Error(), - }); e != nil { - log.Error("send stream subscribe error message", "err", err) - } + }) } }() |