web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed race condtion causing server to occasionally fail to start up

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-12-19 18:21:29 +01:00
parent ff0e4bfe86
commit fe0030a0d6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pinned.js
View File

@ -35,11 +35,16 @@ const hashesFromPinFile = (pinFile, fileName) => {
module.exports.load = function (cb) { module.exports.load = function (cb) {
nThen((waitFor) => { nThen((waitFor) => {
Fs.readdir('./pins', waitFor((err, list) => { Fs.readdir('./pins', waitFor((err, list) => {
if (err) { throw err; } if (err) {
if (err.code === 'ENOENT') {
dirList = [];
return;
}
throw err;
}
dirList = list; dirList = list;
})); }));
}).nThen((waitFor) => { }).nThen((waitFor) => {
fileList.splice(0, fileList.length);
dirList.forEach((f) => { dirList.forEach((f) => {
sema.take((returnAfter) => { sema.take((returnAfter) => {
Fs.readdir('./pins/' + f, waitFor(returnAfter((err, list2) => { Fs.readdir('./pins/' + f, waitFor(returnAfter((err, list2) => {