aboutsummaryrefslogtreecommitdiffstats
path: root/swarm/network/stream/messages.go
diff options
context:
space:
mode:
Diffstat (limited to 'swarm/network/stream/messages.go')
-rw-r--r--swarm/network/stream/messages.go11
1 files changed, 10 insertions, 1 deletions
diff --git a/swarm/network/stream/messages.go b/swarm/network/stream/messages.go
index 74c785d58..68503fe1f 100644
--- a/swarm/network/stream/messages.go
+++ b/swarm/network/stream/messages.go
@@ -76,7 +76,16 @@ type RequestSubscriptionMsg struct {
func (p *Peer) handleRequestSubscription(ctx context.Context, req *RequestSubscriptionMsg) (err error) {
log.Debug(fmt.Sprintf("handleRequestSubscription: streamer %s to subscribe to %s with stream %s", p.streamer.addr, p.ID(), req.Stream))
- return p.streamer.Subscribe(p.ID(), req.Stream, req.History, req.Priority)
+ if err = p.streamer.Subscribe(p.ID(), req.Stream, req.History, req.Priority); err != nil {
+ // 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(ctx, SubscribeErrorMsg{
+ Error: err.Error(),
+ })
+ }
+ return err
}
func (p *Peer) handleSubscribeMsg(ctx context.Context, req *SubscribeMsg) (err error) {