Skip to content

fs: use finished over destroy w/ cb #32809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ronag wants to merge 2 commits into from
Closed

fs: use finished over destroy w/ cb #32809

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7494d73
fs: use finished over destroy w/ cb
ronag Apr 13, 2020
f229cac
fixup: handle cb null case
ronag Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/internal/fs/streams.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const {
copyObject,
getOptions,
} = require('internal/fs/utils');
const { Readable, Writable } = require('stream');
const { Readable, Writable, finished } = require('stream');
const { toPathIfFileURL } = require('internal/url');
const kIoDone = Symbol('kIoDone');
const kIsPerformingIO = Symbol('kIsPerformingIO');
Expand Down Expand Up @@ -273,7 +273,8 @@ function closeFsStream(stream, cb, err) {
}

ReadStream.prototype.close = function(cb) {
this.destroy(null, cb);
finished(this, cb);
Comment thread
ronag marked this conversation as resolved.
Outdated
this.destroy();
};

ObjectDefineProperty(ReadStream.prototype, 'pending', {
Expand Down