beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

pass handleUploadError as checkForBreakingError to putFilePart and putFile's retryHTppCall checkForBreakingError util

Browse source
This commit is contained in:
Abhinav 2022-08-31 16:22:32 +05:30
parent e109b1e0f0
commit 506002499e
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/services/upload/uploadHttpClient.ts
View file

@ -92,14 +92,16 @@ class UploadHttpClient {
progressTracker progressTracker
): Promise<string> { ): Promise<string> {
try { try {
await retryHTTPCall(() => await retryHTTPCall(
HTTPService.put( () =>
fileUploadURL.url, HTTPService.put(
file, fileUploadURL.url,
null, file,
null, null,
progressTracker null,
) progressTracker
),
handleUploadError
); );
return fileUploadURL.objectKey; return fileUploadURL.objectKey;
} catch (e) { } catch (e) {
@ -127,7 +129,9 @@ class UploadHttpClient {
); );
return fileUploadURL.objectKey; return fileUploadURL.objectKey;
} catch (e) { } catch (e) {
logError(e, 'putFile to dataStore failed '); if (e.message !== CustomError.UPLOAD_CANCELLED) {
logError(e, 'putFile to dataStore failed ');
}
throw e; throw e;
} }
} }
@ -152,10 +156,12 @@ class UploadHttpClient {
throw err; throw err;
} }
return resp; return resp;
}); }, handleUploadError);
return response.headers.etag as string; return response.headers.etag as string;
} catch (e) { } catch (e) {
logError(e, 'put filePart failed'); if (e.message !== CustomError.UPLOAD_CANCELLED) {
logError(e, 'put filePart failed');
}
throw e; throw e;
} }
} }