Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions src/WorkerError.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
const stack = (err, worker, workerId) => {
const originError = err.stack
.split('\n')
.filter(line => line.trim().startsWith('at'));

const workerError = worker
.split('\n')
.filter(line => line.trim().startsWith('at'));

const diff = workerError.slice(0, workerError.length - originError.length).join('\n');

originError.unshift(diff);
originError.unshift(err.message);
originError.unshift(`Thread Loader (Worker ${workerId})`);

return originError.join('\n');
};

class WorkerError extends Error {
constructor(err, workerId) {
super(err);
this.name = err.name;
this.message = err.message;

Error.captureStackTrace(this, this.constructor);

this.stack = stack(err, this.stack, workerId);
}
}

export default WorkerError;
11 changes: 2 additions & 9 deletions src/WorkerPool.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import childProcess from 'child_process';
import asyncQueue from 'async/queue';
import asyncMapSeries from 'async/mapSeries';
import readBuffer from './readBuffer';
import WorkerError from './WorkerError';

const workerPath = require.resolve('./worker');

Expand Down Expand Up @@ -183,14 +184,7 @@ class PoolWorker {
} else {
obj = arg;
}
const err = new Error(obj.message);
err.message = obj.message;
if (obj.stack) {
err.stack = `${obj.stack}\n\tfrom thread-loader (worker ${this.id})\n${err.stack}`;
}
err.hideStack = obj.hideStack;
err.details = obj.details;
return err;
return new WorkerError(obj, this.id);
}

readBuffer(length, callback) {
Expand Down Expand Up @@ -272,4 +266,3 @@ export default class WorkerPool {
}
}
}