Skip to content

Commit

Permalink
Await on graphql.execute() before calling executionDidEnd handler (AS…
Browse files Browse the repository at this point in the history
…-59) (#2298)

* Wait on graphql.execute() before calling end handler

* Update changelog
  • Loading branch information
cheapsteak authored and abernix committed Feb 12, 2019
1 parent e3070a5 commit bf12001
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
@@ -1,6 +1,7 @@
# Changelog

### vNEXT
- Fix inaccurate total duration in apollo-tracing [PR #2298](https://github.com/apollographql/apollo-server/pull/2298)

### v2.4.0

Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-core/src/requestPipeline.ts
Expand Up @@ -356,7 +356,7 @@ export async function processGraphQLRequest<TContext>(
});

try {
return graphql.execute(executionArgs);
return await graphql.execute(executionArgs);
} finally {
executionDidEnd();
}
Expand Down

0 comments on commit bf12001

Please sign in to comment.