Merge pull request #834 from sputn1ck/fix_select

reservations: check if channel is closing

Author: sputn1ck

instantout/reservation/manager.go

@@ -56,15 +56,22 @@ func (m *Manager) Run(ctx context.Context, height int32) error {
 		return err
 	}
 
-	ntfnChan := m.cfg.NotificationManager.SubscribeReservations(ctx)
+	ntfnChan := m.cfg.NotificationManager.SubscribeReservations(runCtx)
 
 	for {
 		select {
 		case height := <-newBlockChan:
 			log.Debugf("Received block %v", height)
 			currentHeight = height
 
-		case reservationRes := <-ntfnChan:
+		case reservationRes, ok := <-ntfnChan:
+			if !ok {
+				// The channel has been closed, we'll stop the
+				// reservation manager.
+				log.Debugf("Stopping reservation manager (ntfnChan closed)")
+				return nil
+			}
+
 			log.Debugf("Received reservation %x",
 				reservationRes.ReservationId)
 			_, err := m.newReservation(