NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

ImportHandler: Use return reject(...) to avoid double settle

Browse source
This commit is contained in:
Richard Hansen 2021-02-07 18:57:25 -05:00 committed by John McLear
parent e01059dce5
commit 908635a1de
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/node/handler/ImportHandler.js
View file

@ -99,16 +99,15 @@ const doImport = async (req, res, padId) => {
// I hate doing indexOf here but I can't see anything to use... // I hate doing indexOf here but I can't see anything to use...
if (err && err.stack && err.stack.indexOf('maxFileSize') !== -1) { if (err && err.stack && err.stack.indexOf('maxFileSize') !== -1) {
reject('maxFileSize'); return reject('maxFileSize');
} }
reject('uploadFailed'); return reject('uploadFailed');
} }
if (!files.file) { // might not be a graceful fix but it works if (!files.file) { // might not be a graceful fix but it works
reject('uploadFailed'); return reject('uploadFailed');
} else {
resolve(files.file.path);
} }
resolve(files.file.path);
}); });
}); });
@ -177,7 +176,7 @@ const doImport = async (req, res, padId) => {
// catch convert errors // catch convert errors
if (err) { if (err) {
console.warn('Converting Error:', err); console.warn('Converting Error:', err);
reject('convertFailed'); return reject('convertFailed');
} }
resolve(); resolve();
}); });