infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

stop using waitFor.abort() which is apparently not implemented

pull/1/head
Caleb James DeLisle 2016-09-13 17:10:50 +02:00
parent 2021bf6702
commit 5fe3ffabd1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/file.js
View File

@ -77,26 +77,29 @@ var getChannel = function (env, id, callback) {
}
var path = mkPath(env, id);
var fileExists;
var errorState;
nThen(function (waitFor) {
checkPath(path, waitFor(function (err, exists) {
if (err) {
waitFor.abort();
errorState = true;
complete(err);
return;
}
fileExists = exists;
}));
}).nThen(function (waitFor) {
if (errorState) { return; }
if (!fileExists) { return; }
readMessages(path, function (msg) {
channel.messages.push(msg);
}, waitFor(function (err) {
if (err) {
waitFor.abort();
errorState = true;
complete(err);
}
}));
}).nThen(function (waitFor) {
if (errorState) { return; }
var stream = channel.writeStream = Fs.createWriteStream(path, { flags: 'a' });
stream.on('open', waitFor());
stream.on('error', function (err) {
@ -110,6 +113,7 @@ var getChannel = function (env, id, callback) {
}
});
}).nThen(function (waitFor) {
if (errorState) { return; }
complete();
});
};