Skip to content

Commit 10db479

Browse files
authored
fix(sandbox): better error reporting broken processor file
1 parent 0d5687a commit 10db479

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

lib/process/child-pool.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ ChildPool.prototype.retain = function(processFile) {
6464
})
6565
.catch(err => {
6666
this.remove(child);
67-
throw new Error(err);
67+
throw err;
6868
});
6969
});
7070
};
@@ -115,8 +115,8 @@ async function initChild(child, processFile) {
115115
const onMessageHandler = msg => {
116116
if (msg.cmd === 'init-complete') {
117117
resolve();
118-
} else {
119-
reject(msg.value);
118+
} else if (msg.cmd === 'error') {
119+
reject(msg.error);
120120
}
121121
child.off('message', onMessageHandler);
122122
};

lib/process/master.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ process.on('message', msg => {
5050
processor = require(msg.value);
5151
} catch (err) {
5252
status = 'Errored';
53+
err.message = `Error loading process file ${msg.value}. ${err.message}`;
5354
return process.send({
5455
cmd: 'error',
55-
value: `Error loading process file ${msg.value}. ${err.toString()}`
56+
error: err
5657
});
5758
}
5859

0 commit comments

Comments
 (0)