Skip to content

Support async stack traces #1621

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

Closed
wants to merge 1 commit into from
Closed

Support async stack traces #1621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions lib/model/Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,14 @@ class Model {

static query(trx) {
const query = this.QueryBuilder.forClass(this).transacting(trx);

const knex = this.knex();
if (knex && knex.client && knex.client.config && knex.client.config.asyncStackTraces) {
const err = new Error();
const lines = err.stack.split('\n').slice(1);
query._asyncStack = lines;
}

this.onCreateQuery(query);
return query;
}
Expand Down
8 changes: 8 additions & 0 deletions lib/queryBuilder/QueryBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,8 @@ class QueryBuilder extends QueryBuilderBase {
builder._findOperationOptions = this._findOperationOptions;
builder._relatedQueryFor = this._relatedQueryFor;

builder._asyncStack = this._asyncStack;

return builder;
}

Expand Down Expand Up @@ -1491,6 +1493,12 @@ function afterExecute(builder, result) {
}

function handleExecuteError(builder, err) {
if (builder._asyncStack) {
const originalStack = err.stack.split('\n');
const newStack = originalStack.concat(builder._asyncStack);
err.stack = newStack.join('\n');
}

let promise = Promise.reject(wrapError(err));

builder.forEachOperation(true, op => {
Expand Down