diff options
author | Anatoli Papirovski <apapirovski@mac.com> | 2018-04-13 10:37:28 +0200 |
---|---|---|
committer | Anatoli Papirovski <apapirovski@mac.com> | 2018-04-17 16:05:11 +0200 |
commit | 4f2000f9fecbd7102403cc24b962f4e40994243a (patch) | |
tree | 675a80319f081f4c7c1c6ab5bc35570633817085 /test/async-hooks | |
parent | 734eb17e5d19145c4c5a696aa94e81c9655272f5 (diff) | |
download | node-new-4f2000f9fecbd7102403cc24b962f4e40994243a.tar.gz |
timers: call destroy on interval error
When an interval callback throws an error, the destroy
hook is never called due to a faulty if condition.
PR-URL: https://github.com/nodejs/node/pull/20001
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'test/async-hooks')
-rw-r--r-- | test/async-hooks/test-timers.setInterval.js | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/test/async-hooks/test-timers.setInterval.js b/test/async-hooks/test-timers.setInterval.js new file mode 100644 index 0000000000..a3434e134f --- /dev/null +++ b/test/async-hooks/test-timers.setInterval.js @@ -0,0 +1,37 @@ +'use strict'; + +const common = require('../common'); +const assert = require('assert'); +const initHooks = require('./init-hooks'); +const { checkInvocations } = require('./hook-checks'); +const TIMEOUT = common.platformTimeout(100); + +const hooks = initHooks(); +hooks.enable(); + +setInterval(common.mustCall(ontimeout), TIMEOUT); +const as = hooks.activitiesOfTypes('Timeout'); +assert.strictEqual(as.length, 1); +const t1 = as[0]; +assert.strictEqual(t1.type, 'Timeout'); +assert.strictEqual(typeof t1.uid, 'number'); +assert.strictEqual(typeof t1.triggerAsyncId, 'number'); +checkInvocations(t1, { init: 1 }, 't1: when timer installed'); + +function ontimeout() { + checkInvocations(t1, { init: 1, before: 1 }, 't1: when first timer fired'); + + throw new Error('setInterval Error'); +} + +process.once('uncaughtException', common.mustCall((err) => { + assert.strictEqual(err.message, 'setInterval Error'); +})); + +process.on('exit', () => { + hooks.disable(); + hooks.sanityCheck('Timeout'); + + checkInvocations(t1, { init: 1, before: 1, after: 1, destroy: 1 }, + 't1: when process exits'); +}); |