deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-05-02 06:02:53 +02:00
Code Issues Projects Releases Wiki Activity

Resolve 500 & 504 HTTP Status Codes

Browse source 
* When completing some operations on OneDrive, a 504 error can be returned when Microsoft Graph times out when communicating with internal resources. Rather than failing, handle the 504 and retry the request.
* When performing numerous changes via OneDrive online, Microsoft Graph has an issue in interpreting the the response, thus generates a 500 internal server error. As this is something we cannot fix, handle the 500 error by gracefully exiting.
This commit is contained in:
abraunegg 2018-05-05 17:00:50 +10:00
parent 4e0c3a4cf0
commit 0c4def83f8
1 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/sync.d
View file

@ -327,9 +327,24 @@ final class SyncEngine
log.vlog("Delta link expired, resyncing...");
deltaLink = null;
continue;
} else {
throw e;
}
if (e.httpStatusCode == 500) {
// HTTP request returned status code 500 (Internal Server Error)
// Exit Application
log.vlog("\n\nOneDrive returned a 'HTTP 500 - Internal Server Error'");
log.vlog("This is a OneDrive API Bug - https://github.com/OneDrive/onedrive-api-docs/issues/844\n\n");
return;
}
if (e.httpStatusCode == 504) {
// HTTP request returned status code 504 (Gateway Timeout)
// Retry
log.vlog("OneDrive returned a 'HTTP 504 - Gateway Timeout' - gracefully handling error");
changes = onedrive.viewChangesById(driveId, defaultRootId, deltaLink);
}
else throw e;
}
foreach (item; changes["value"].array) {
bool isRoot = false;
@ -751,7 +766,17 @@ final class SyncEngine
write("Uploading file ", path, "...");
JSONValue response;
if (getSize(path) <= thresholdFileSize) {
response = onedrive.simpleUploadReplace(path, item.driveId, item.id, item.eTag);
try {
response = onedrive.simpleUploadReplace(path, item.driveId, item.id, item.eTag);
} catch (OneDriveException e) {
if (e.httpStatusCode == 504) {
// HTTP request returned status code 504 (Gateway Timeout)
// Try upload as a session
log.vlog("OneDrive returned a 'HTTP 504 - Gateway Timeout' - gracefully handling error");
response = session.upload(path, item.driveId, item.parentId, baseName(path), eTag);
}
else throw e;
}
writeln(" done.");
} else {
writeln("");
@ -943,7 +968,17 @@ final class SyncEngine
write("Uploading file ", path, "...");
JSONValue response;
if (getSize(path) <= thresholdFileSize) {
response = onedrive.simpleUpload(path, parent.driveId, parent.id, baseName(path));
try {
response = onedrive.simpleUpload(path, parent.driveId, parent.id, baseName(path));
} catch (OneDriveException e) {
if (e.httpStatusCode == 504) {
// HTTP request returned status code 504 (Gateway Timeout)
// Try upload as a session
log.vlog("OneDrive returned a 'HTTP 504 - Gateway Timeout' - gracefully handling error");
response = session.upload(path, parent.driveId, parent.id, baseName(path));
}
else throw e;
}
writeln(" done.");
} else {
writeln("");