summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoyee Cheung <joyeec9h3@gmail.com>2019-01-10 23:32:05 +0800
committerJoyee Cheung <joyeec9h3@gmail.com>2019-01-16 16:19:22 +0800
commit6b2af91a88b0a5e4d846701971065b8d668c8b1d (patch)
treea9fe15cd62da0dd195ac2ae846e2a08df81f4242 /lib
parentc7ec5e44bd4a0d0e513e0c9c412730deefc13bf5 (diff)
downloadandroid-node-v8-6b2af91a88b0a5e4d846701971065b8d668c8b1d.tar.gz
android-node-v8-6b2af91a88b0a5e4d846701971065b8d668c8b1d.tar.bz2
android-node-v8-6b2af91a88b0a5e4d846701971065b8d668c8b1d.zip
process: register the inspector async hooks in bootstrap/node.js
So it's easier to tell the side effects of this setup. PR-URL: https://github.com/nodejs/node/pull/25443 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/internal/bootstrap/node.js6
-rw-r--r--lib/internal/inspector_async_hook.js13
2 files changed, 9 insertions, 10 deletions
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index ca979af258..26585f5df9 100644
--- a/lib/internal/bootstrap/node.js
+++ b/lib/internal/bootstrap/node.js
@@ -159,7 +159,11 @@ function startup() {
}
if (config.hasInspector) {
- NativeModule.require('internal/inspector_async_hook').setup();
+ const {
+ enable,
+ disable
+ } = NativeModule.require('internal/inspector_async_hook');
+ internalBinding('inspector').registerAsyncHook(enable, disable);
}
// If the process is spawned with env NODE_CHANNEL_FD, it's probably
diff --git a/lib/internal/inspector_async_hook.js b/lib/internal/inspector_async_hook.js
index 4a3d31fc2a..b16e8d025e 100644
--- a/lib/internal/inspector_async_hook.js
+++ b/lib/internal/inspector_async_hook.js
@@ -1,16 +1,10 @@
'use strict';
-const inspector = internalBinding('inspector');
-
-if (!inspector || !inspector.asyncTaskScheduled) {
- exports.setup = function() {};
- return;
-}
-
let hook;
let config;
function lazyHookCreation() {
+ const inspector = internalBinding('inspector');
const { createHook } = require('async_hooks');
config = internalBinding('config');
@@ -72,6 +66,7 @@ function disable() {
hook.disable();
}
-exports.setup = function() {
- inspector.registerAsyncHook(enable, disable);
+module.exports = {
+ enable,
+ disable
};