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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
yflory 2018-01-29 15:18:40 +01:00
parent bdafc101c9 66f1b55d9a
commit 1fd4f43c7c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpc.js
View File

@ -369,15 +369,19 @@ var getDeletedPads = function (Env, channels, cb) {
var sem = Saferphore.create(10);
var absentees = [];
var job = function (channel, wait) {
return function (give) {
getFileSize(Env, channel, wait(give(function (e, size) {
if (e) { return; }
if (size === 0) { absentees.push(channel); }
})));
};
};
nThen(function (w) {
for (var i = 0; i < L; i++) {
let channel = channels[i];
sem.take(function (give) {
getFileSize(Env, channel, w(give(function (e, size) {
if (e) { return; }
if (size === 0) { absentees.push(channel); }
})));
});
sem.take(job(channels[i], w));
}
}).nThen(function () {
cb(void 0, absentees);

2
storage/tasks.js
View File

@ -63,7 +63,7 @@ var write = function (env, task, cb) {
return void cb(err);
}
}));
}).nThen(function (w) {
}).nThen(function () {
// write the file to the path
Fs.writeFile(mkPath(env, id), str, function (e) {
if (e) { return void cb(e); }