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

listObjectsV2 does not work on some S3 providers

Browse Source 
specifically, cloudscale does not support it
This commit is contained in:
Girish Ramakrishnan
2017-10-05 12:02:12 -07:00
parent ee8ee8e786
commit f0dd90a1f5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/s3.js
View File

@@ -182,13 +182,13 @@ function listDir(apiConfig, backupFilePath, options, iteratorCallback, callback)
var total = 0;
async.forever(function listAndDownload(foreverCallback) {
s3.listObjectsV2(listParams, function (error, listData) {
s3.listObjects(listParams, function (error, listData) {
if (error) {
debug('remove: Failed to list %s. Not fatal.', error);
return foreverCallback(error);
}
debug('listDir: processing %s files (processed %s so far)', listData.Contents.length, total);
debug('listDir: processing %s files (processed %s so far). From "%s"', listData.Contents.length, total, listParams.Marker || '');
var arr = options.batchSize === 1 ? listData.Contents : chunk(listData.Contents, options.batchSize);
@@ -199,7 +199,7 @@ function listDir(apiConfig, backupFilePath, options, iteratorCallback, callback)
if (!listData.IsTruncated) return foreverCallback(new Error('Done'));
listParams.StartAfter = listData.Contents[listData.Contents.length - 1].Key; // NextMarker is returned only with delimiter
listParams.Marker = listData.Contents[listData.Contents.length - 1].Key; // NextMarker is returned only with delimiter
foreverCallback();
});