Skip to content
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.

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

backport close race condition fix from 1.3 #5

Open
wants to merge 4 commits into
base: review3-base
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions lib/filewriter.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,18 @@ FileWriter.prototype = {
var guard, error = null;
function finish(err) {
if (guard && global.clearTimeout) clearTimeout(guard);
var closeErr;
guard = null;
if (fd !== null) fs.close(fd, function(){});
if (fd !== null) try { fs.closeSync(fd) } catch (e) { closeErr = e }
fd = null;
return error ? cb(error) : cb(err);
return cb(error || err || closeErr);
}
try {
guard = setTimeout(function() {
if (fd !== null) fs.close(fd, function(){});
var closeErr;
if (fd !== null) try { fs.closeSync(fd) } catch (e) { closeErr = e }
error = new Error("timed out waiting for last write");
// we can return only one error, choose the timeout error a close error
return finish(error);
}, mutexTimeout)
fd = fs.openSync(newName, 'r');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qfputs",
"version": "1.2.2",
"version": "1.2.5",
"description": "fast bufferd line-at-a-time output",
"license": "Apache-2.0",
"repository": {
Expand Down