Update logging of 500 & 504 errors

* Update logging of 500 & 504 errors. For 504 errors this was 'breaking the formatting of the log line. For 500 errors - this needs to be logged regardless of verbosity.
This commit is contained in:
abraunegg 2018-05-07 05:37:47 +10:00
parent 0c4def83f8
commit accb62bdeb

View file

@ -332,15 +332,15 @@ final class SyncEngine
if (e.httpStatusCode == 500) { if (e.httpStatusCode == 500) {
// HTTP request returned status code 500 (Internal Server Error) // HTTP request returned status code 500 (Internal Server Error)
// Exit Application // Exit Application
log.vlog("\n\nOneDrive returned a 'HTTP 500 - Internal Server Error'"); log.log("\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"); log.log("This is a OneDrive API Bug - https://github.com/OneDrive/onedrive-api-docs/issues/844\n\n");
return; return;
} }
if (e.httpStatusCode == 504) { if (e.httpStatusCode == 504) {
// HTTP request returned status code 504 (Gateway Timeout) // HTTP request returned status code 504 (Gateway Timeout)
// Retry // Retry
log.vlog("OneDrive returned a 'HTTP 504 - Gateway Timeout' - gracefully handling error"); //log.vlog("OneDrive returned a 'HTTP 504 - Gateway Timeout' - gracefully handling error");
changes = onedrive.viewChangesById(driveId, defaultRootId, deltaLink); changes = onedrive.viewChangesById(driveId, defaultRootId, deltaLink);
} }
@ -772,7 +772,7 @@ final class SyncEngine
if (e.httpStatusCode == 504) { if (e.httpStatusCode == 504) {
// HTTP request returned status code 504 (Gateway Timeout) // HTTP request returned status code 504 (Gateway Timeout)
// Try upload as a session // Try upload as a session
log.vlog("OneDrive returned a 'HTTP 504 - Gateway Timeout' - gracefully handling error"); //log.vlog("OneDrive returned a 'HTTP 504 - Gateway Timeout' - gracefully handling error");
response = session.upload(path, item.driveId, item.parentId, baseName(path), eTag); response = session.upload(path, item.driveId, item.parentId, baseName(path), eTag);
} }
else throw e; else throw e;
@ -974,7 +974,7 @@ final class SyncEngine
if (e.httpStatusCode == 504) { if (e.httpStatusCode == 504) {
// HTTP request returned status code 504 (Gateway Timeout) // HTTP request returned status code 504 (Gateway Timeout)
// Try upload as a session // Try upload as a session
log.vlog("OneDrive returned a 'HTTP 504 - Gateway Timeout' - gracefully handling error"); //log.vlog("OneDrive returned a 'HTTP 504 - Gateway Timeout' - gracefully handling error");
response = session.upload(path, parent.driveId, parent.id, baseName(path)); response = session.upload(path, parent.driveId, parent.id, baseName(path));
} }
else throw e; else throw e;