TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 95 Pull requests 4 Projects Releases 1 Activity Actions

[#324] morph/listener: Do not subscribe on new blocks without handlers

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-01-25 16:45:59 +03:00 committed by Alex Vanin
parent 96f750d9c8
commit 44c899b560
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/morph/event/listener.go
View file

@ -4,6 +4,7 @@ import (
"context" "context"
"sync" "sync"
"github.com/nspcc-dev/neo-go/pkg/core/block"
"github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/core/state"
"github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/morph/client" "github.com/nspcc-dev/neofs-node/pkg/morph/client"
@ -153,8 +154,11 @@ func (s listener) listen(ctx context.Context, intError chan<- error) error {
} }
func (s listener) listenLoop(ctx context.Context, chEvent <-chan *state.NotificationEvent, intErr chan<- error) { func (s listener) listenLoop(ctx context.Context, chEvent <-chan *state.NotificationEvent, intErr chan<- error) {
blockChan, err := s.subscriber.BlockNotifications() var blockChan <-chan *block.Block
if err != nil {
if len(s.blockHandlers) > 0 {
var err error
if blockChan, err = s.subscriber.BlockNotifications(); err != nil {
if intErr != nil { if intErr != nil {
intErr <- errors.Wrap(err, "could not open block notifications channel") intErr <- errors.Wrap(err, "could not open block notifications channel")
} else { } else {
@ -165,6 +169,9 @@ func (s listener) listenLoop(ctx context.Context, chEvent <-chan *state.Notifica
return return
} }
} else {
blockChan = make(chan *block.Block)
}
loop: loop:
for { for {