internal/task/service.go

@@ -23,12 +23,9 @@ func newService(mp common.MerchProvider) *service {
 }
 
 func (s *service) RequestTasks(_ *emptypb.Empty, stream tt.TaskProcessor_RequestTasksServer) error {
-	ctx, cancel := context.WithCancel(context.Background())
-
-	tasks, err := s.merchProvider.GetTasks(ctx)
+	tasks, err := s.merchProvider.GetTasks(stream.Context())
 	if err != nil {
 		log.WithError(err).Errorf("%v Failed to get tasks", pkgLogHeader)
-		cancel()
 		return err
 	}
 
@@ -38,11 +35,10 @@ func (s *service) RequestTasks(_ *emptypb.Empty, stream tt.TaskProcessor_Request
 			Origins:   task.Origins,
 		}); err != nil {
 			log.WithError(err).Errorf("%v Failed to send tasks", pkgLogHeader)
-			cancel()
 			return err
 		}
 	}
-	cancel()
+
 	return nil
 }