Add ResolverError field to QueryError for post processing

graph-gophers · Jan 11, 2017 · 24b2045 · 24b2045
1 parent b7c59ab
commit 24b2045
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/errors/errors.go b/errors/errors.go
@@ -3,8 +3,9 @@ package errors
 import "fmt"
 
 type QueryError struct {
-	Message   string      `json:"message"`
-	Locations []*Location `json:"locations,omitempty"`
+	Message       string      `json:"message"`
+	Locations     []*Location `json:"locations,omitempty"`
+	ResolverError error       `json:"-"`
 }
 
 type Location struct {

diff --git a/internal/exec/exec.go b/internal/exec/exec.go
@@ -303,6 +303,9 @@ func (r *request) addError(err *errors.QueryError) {
 func (r *request) handlePanic() {
 	if err := recover(); err != nil {
 		execErr := errors.Errorf("graphql: panic occured: %v", err)
+		if err, ok := err.(error); ok {
+			execErr.ResolverError = err
+		}
 		r.addError(execErr)
 
 		const size = 64 << 10
@@ -554,7 +557,9 @@ func (e *fieldExec) execField(ctx context.Context, r *request, f *query.Field, r
 	result, err := e.execField2(spanCtx, r, f, resolver, span)
 
 	if err != nil {
-		r.addError(errors.Errorf("%s", err))
+		queryError := errors.Errorf("%s", err)
+		queryError.ResolverError = err
+		r.addError(queryError)
 		addResult(f.Alias, nil) // TODO handle non-nil
 
 		ext.Error.Set(span, true)