aarifullin/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#324] morph/listener: Prevent potential writing to nil channel

Browse source 
Write error returned by BlockNotifications() call ins listenLoop method body
to error channel only if it is procided. Otherwise, write debug log message.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-01-25 14:57:44 +03:00 committed by Alex Vanin
parent 96febdb6a5
commit 5e212f97d6
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,7 +155,13 @@ 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() blockChan, err := s.subscriber.BlockNotifications()
if err != nil { if err != nil {
intErr <- errors.Wrap(err, "could not open block notifications channel") if intErr != nil {
intErr <- errors.Wrap(err, "could not open block notifications channel")
} else {
s.log.Debug("could not open block notifications channel",
zap.String("error", err.Error()),
)
}
return return
} }