jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make s3.deleteObjects return error

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-02-22 11:05:29 -08:00
parent 0bfdaeb2fb
commit 1f30a4f3ea
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/storage/s3.js
View File

@@ -414,10 +414,11 @@ function remove(apiConfig, filename, callback) {
}
};
// deleteObjects does not return error if key is not found
s3.deleteObjects(deleteParams, function (error) {
if (error) debug('remove: Unable to remove %s. Not fatal.', deleteParams.Key, error);
callback(null);
callback(error);
});
});
}
@@ -439,13 +440,11 @@ function removeDir(apiConfig, pathPrefix) {
events.emit('progress', `Removing ${contents.length} files from ${contents[0].Key} to ${contents[contents.length-1].Key}`);
// deleteObjects does not return error if key is not found
s3.deleteObjects(deleteParams, function (error /*, deleteData */) {
if (error) {
events.emit('progress', `Unable to remove ${deleteParams.Key} ${error.message}`);
return iteratorCallback(error);
}
if (error) events.emit('progress', `Unable to remove ${deleteParams.Key} ${error.message}`);
iteratorCallback();
iteratorCallback(error);
});
}