diff options
author | Gerhard Stoebich <18708370+Flarna@users.noreply.github.com> | 2019-04-23 00:57:12 +0200 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2019-05-03 16:02:55 +0200 |
commit | 8876ac5c358114f0f88424f6737ca4b89fc9e6c7 (patch) | |
tree | 5b0804517e873f3c08b236104b11f26dd752f941 /test/parallel/test-async-hooks-http-parser-destroy.js | |
parent | 8dae89b396df64e6a9e44cb94efe27809a5a3d89 (diff) | |
download | android-node-v8-8876ac5c358114f0f88424f6737ca4b89fc9e6c7.tar.gz android-node-v8-8876ac5c358114f0f88424f6737ca4b89fc9e6c7.tar.bz2 android-node-v8-8876ac5c358114f0f88424f6737ca4b89fc9e6c7.zip |
async_hooks: fixup do not reuse HTTPParser
Fix some issues introduced/not fixed via
https://github.com/nodejs/node/pull/25094:
* Init hook is not emitted for a reused HTTPParser
* HTTPParser was still used as resource in init hook
* type used in init hook was always HTTPINCOMINGMESSAGE even for client
requests
* some tests have not been adapted to new resource names
With this change the async hooks init event is emitted during a call
to Initialize() as the type and resource object is available at this
time. As a result Initialize() must be called now which could be seen
as breaking change even HTTPParser is not part of documented API.
It was needed to put the ClientRequest instance into a wrapper object
instead passing it directly as async resource otherwise
test-domain-multi fails. I think this is because adding an EventEmitter
to a Domain adds a property 'domain' and the presence of this changes
the context propagation in domains.
Besides that tests still refering to resource HTTPParser have been
updated/improved.
Fixes: https://github.com/nodejs/node/issues/27467
Fixes: https://github.com/nodejs/node/issues/26961
Refs: https://github.com/nodejs/node/pull/25094
PR-URL: https://github.com/nodejs/node/pull/27477
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'test/parallel/test-async-hooks-http-parser-destroy.js')
-rw-r--r-- | test/parallel/test-async-hooks-http-parser-destroy.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/parallel/test-async-hooks-http-parser-destroy.js b/test/parallel/test-async-hooks-http-parser-destroy.js index d2e1071c28..d69c474c1d 100644 --- a/test/parallel/test-async-hooks-http-parser-destroy.js +++ b/test/parallel/test-async-hooks-http-parser-destroy.js @@ -16,7 +16,7 @@ const createdIds = []; const destroyedIds = []; async_hooks.createHook({ init: common.mustCallAtLeast((asyncId, type) => { - if (type === 'HTTPPARSER') { + if (type === 'HTTPINCOMINGMESSAGE' || type === 'HTTPCLIENTREQUEST') { createdIds.push(asyncId); } }, N), @@ -25,7 +25,7 @@ async_hooks.createHook({ } }).enable(); -const server = http.createServer(function(req, res) { +const server = http.createServer((req, res) => { res.end('Hello'); }); @@ -39,6 +39,7 @@ const countdown = new Countdown(N, () => { // Give the server sockets time to close (which will also free their // associated parser objects) after the server has been closed. setTimeout(() => { + assert.strictEqual(createdIds.length, 2 * N); createdIds.forEach((createdAsyncId) => { assert.ok(destroyedIds.indexOf(createdAsyncId) >= 0); }); |