Fix lint. (#261)

wavesplatform · Jun 10, 2024 · 662fdfb · 662fdfb
1 parent 826a40a
commit 662fdfb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/pkg/messaging/pair/server.go b/pkg/messaging/pair/server.go
@@ -39,10 +39,24 @@ func StartPairMessagingServer(
 		return err
 	}
 
+	loopErr := enterLoop(ctx, socket, logger, ns, es)
+	if loopErr != nil && !errors.Is(loopErr, context.Canceled) {
+		return loopErr
+	}
+	return nil
+}
+
+func enterLoop(
+	ctx context.Context,
+	socket protocol.Socket,
+	logger *zap.Logger,
+	ns nodes.Storage,
+	es *events.Storage,
+) error {
 	for {
 		select {
 		case <-ctx.Done():
-			return nil
+			return ctx.Err()
 		default:
 			rawMsg, recvErr := socket.Recv()
 			if recvErr != nil {

diff --git a/pkg/messaging/pubsub/server.go b/pkg/messaging/pubsub/server.go
@@ -37,15 +37,18 @@ func StartPubMessagingServer(
 	if err := socketPub.Listen(nanomsgURL); err != nil {
 		return err
 	}
-
-	return enterLoop(ctx, alerts, logger, socketPub)
+	loopErr := enterLoop(ctx, alerts, logger, socketPub)
+	if loopErr != nil && !errors.Is(loopErr, context.Canceled) {
+		return loopErr
+	}
+	return nil
 }
 
 func enterLoop(ctx context.Context, alerts <-chan entities.Alert, logger *zap.Logger, socketPub protocol.Socket) error {
 	for {
 		select {
 		case <-ctx.Done():
-			return nil
+			return ctx.Err()
 		case alert := <-alerts:
 			logger.Sugar().Infof("Alert has been generated: %v", alert)