Skip to content

Commit

Permalink
stream: emit finish when using writev and cork
Browse files Browse the repository at this point in the history
In Writable, 'finish' was not emitted when using writev() and
cork() in the event of an Error during the write. This commit
makes it consistent with the write() path, which emits 'finish'.

Fixes: #11121
  • Loading branch information
mcollina committed May 25, 2017
1 parent ccd3ead commit c335929
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 2 deletions.
9 changes: 7 additions & 2 deletions lib/_stream_writable.js
Original file line number Diff line number Diff line change
Expand Up @@ -358,14 +358,19 @@ function doWrite(stream, state, writev, len, chunk, encoding, cb) {
function onwriteError(stream, state, sync, er, cb) {
--state.pendingcb;
if (sync)
process.nextTick(cb, er);
process.nextTick(afterError, stream, state, cb, er);
else
cb(er);
afterError(stream, state, cb, er);

stream._writableState.errorEmitted = true;
stream.emit('error', er);
}

function afterError(stream, state, cb, err) {
cb(err);
finishMaybe(stream, state);
}

function onwriteStateUpdate(state) {
state.writing = false;
state.writecb = null;
Expand Down
53 changes: 53 additions & 0 deletions test/parallel/test-stream-writable-writev-finish.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
'use strict';

const common = require('../common');
const assert = require('assert');
const stream = require('stream');

// ensure consistency between the finish event when using cork()
// and writev and when not using them

{
const writable = new stream.Writable();

writable._write = (chunks, encoding, cb) => {
cb(new Error('write test error'));
};

writable.on('finish', common.mustCall());

writable.on('prefinish', common.mustCall());

writable.on('error', common.mustCall((er) => {
assert.strictEqual(er.message, 'write test error');
}));

writable.end('test');
}

{
const writable = new stream.Writable();

writable._write = (chunks, encoding, cb) => {
cb(new Error('write test error'));
};

writable._writev = (chunks, cb) => {
cb(new Error('writev test error'));
};

writable.on('finish', common.mustCall());

writable.on('prefinish', common.mustCall());

writable.on('error', common.mustCall((er) => {
assert.strictEqual(er.message, 'writev test error');
}));

writable.cork();
writable.write('test');

setImmediate(function() {
writable.end('test');
});
}

0 comments on commit c335929

Please sign in to comment.