Skip to content

Commit

Permalink
src: add file name to 'Module did not self-register' error
Browse files Browse the repository at this point in the history
PR-URL: #30125
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: David Carlier <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
  • Loading branch information
nornagon authored and MylesBorins committed Dec 17, 2019
1 parent 0ae1d17 commit 12d7d64
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
7 changes: 6 additions & 1 deletion src/node_binding.cc
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,12 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
mp = dlib->GetSavedModuleFromGlobalHandleMap();
if (mp == nullptr || mp->nm_context_register_func == nullptr) {
dlib->Close();
env->ThrowError("Module did not self-register.");
char errmsg[1024];
snprintf(errmsg,
sizeof(errmsg),
"Module did not self-register: '%s'.",
*filename);
env->ThrowError(errmsg);
return false;
}
}
Expand Down
3 changes: 2 additions & 1 deletion test/addons/dlopen-ping-pong/test-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ require(bindingPath);
new Worker(`require(${JSON.stringify(bindingPath)})`, { eval: true })
.on('error', common.mustCall((err) => {
assert.strictEqual(err.constructor, Error);
assert.strictEqual(err.message, 'Module did not self-register.');
assert.strictEqual(err.message,
`Module did not self-register: '${bindingPath}'.`);
}));
2 changes: 1 addition & 1 deletion test/addons/dlopen-ping-pong/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ assert.strictEqual(module.exports.ping(), 'pong');
// Check that after the addon is loaded with
// process.dlopen() a require() call fails.
console.log('require:', `./build/${common.buildType}/binding`);
const re = /^Error: Module did not self-register\.$/;
const re = /^Error: Module did not self-register: '.*[\\/]binding\.node'\.$/;
assert.throws(() => require(`./build/${common.buildType}/binding`), re);
2 changes: 1 addition & 1 deletion test/addons/not-a-binding/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
const common = require('../../common');
const assert = require('assert');

const re = /^Error: Module did not self-register\.$/;
const re = /^Error: Module did not self-register: '.*[\\/]binding\.node'\.$/;
assert.throws(() => require(`./build/${common.buildType}/binding`), re);

0 comments on commit 12d7d64

Please sign in to comment.