This commit is contained in:
parent
cf1d8ac531
commit
80ec1a2a16
1 changed files with 6 additions and 2 deletions
|
|
@ -23,9 +23,12 @@ func newService(mp common.MerchProvider) *service {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *service) RequestTasks(_ *emptypb.Empty, stream tt.TaskProcessor_RequestTasksServer) error {
|
func (s *service) RequestTasks(_ *emptypb.Empty, stream tt.TaskProcessor_RequestTasksServer) error {
|
||||||
tasks, err := s.merchProvider.GetTasks(stream.Context())
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
|
||||||
|
tasks, err := s.merchProvider.GetTasks(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.WithError(err).Errorf("%v Failed to get tasks", pkgLogHeader)
|
log.WithError(err).Errorf("%v Failed to get tasks", pkgLogHeader)
|
||||||
|
cancel()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -35,10 +38,11 @@ func (s *service) RequestTasks(_ *emptypb.Empty, stream tt.TaskProcessor_Request
|
||||||
Origins: task.Origins,
|
Origins: task.Origins,
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
log.WithError(err).Errorf("%v Failed to send tasks", pkgLogHeader)
|
log.WithError(err).Errorf("%v Failed to send tasks", pkgLogHeader)
|
||||||
|
cancel()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
cancel()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue