Skip to content

Fix data race in Execute #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 2, 2019
Merged

Fix data race in Execute #459

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a12f6f
Fix data race in Execute
egonelbre Mar 10, 2019
552a184
ensure goroutine doesn't hang
egonelbre Mar 10, 2019
e637bd9
fix rebase error
egonelbre Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ensure goroutine doesn't hang
  • Loading branch information
@egonelbre
egonelbre committed Apr 1, 2019
commit 552a1848c8cda7b4d3ca1601bfbade198e091083
7 changes: 2 additions & 5 deletions executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func Execute(p ExecuteParams) (result *Result) {
addExtensionResults(&p, result)
}()

resultChannel := make(chan *Result)
resultChannel := make(chan *Result, 2)

go func() {
result := &Result{}
Expand All @@ -55,10 +55,7 @@ func Execute(p ExecuteParams) (result *Result) {
if err := recover(); err != nil {
result.Errors = append(result.Errors, gqlerrors.FormatError(err.(error)))
}
select {
case resultChannel <- result:
case <-ctx.Done():
}
resultChannel <- result
}()

exeContext, err := buildExecutionContext(buildExecutionCtxParams{
Expand Down