Merge pull request #434 from fishy/fix-data-race

Add Result.AppendErrors

Author: chris-ramon

executor.go

@@ -36,7 +36,7 @@ func Execute(p ExecuteParams) (result *Result) {
 	go func(out chan<- *Result, done <-chan struct{}) {
 		defer func() {
 			if err := recover(); err != nil {
-				result.Errors = append(result.Errors, gqlerrors.FormatError(err.(error)))
+				result.AppendErrors(gqlerrors.FormatError(err.(error)))
 			}
 			select {
 			case out <- result:
@@ -54,7 +54,7 @@ func Execute(p ExecuteParams) (result *Result) {
 		})
 
 		if err != nil {
-			result.Errors = append(result.Errors, gqlerrors.FormatError(err))
+			result.AppendErrors(gqlerrors.FormatError(err))
 			return
 		}
 
@@ -67,7 +67,7 @@ func Execute(p ExecuteParams) (result *Result) {
 
 	select {
 	case <-ctx.Done():
-		result.Errors = append(result.Errors, gqlerrors.FormatError(ctx.Err()))
+		result.AppendErrors(gqlerrors.FormatError(ctx.Err()))
 	case r := <-resultChannel:
 		result = r
 	}

types.go

@@ -1,6 +1,8 @@
 package graphql
 
 import (
+	"sync"
+
 	"github.com/graphql-go/graphql/gqlerrors"
 )
 
@@ -9,8 +11,18 @@ import (
 type Result struct {
 	Data   interface{}                `json:"data"`
 	Errors []gqlerrors.FormattedError `json:"errors,omitempty"`
+
+	errorsLock sync.Mutex
 }
 
 func (r *Result) HasErrors() bool {
 	return len(r.Errors) > 0
 }
+
+// AppendErrors is the thread-safe way to append error(s) to Result.Errors.
+func (r *Result) AppendErrors(errs ...gqlerrors.FormattedError) {
+	r.errorsLock.Lock()
+	defer r.errorsLock.Unlock()
+
+	r.Errors = append(r.Errors, errs...)
+}