diff options
author | Alexander Tkachev | 2019-08-25 14:30:21 +0700 |
---|---|---|
committer | Filippos Karapetis | 2019-08-25 12:15:14 +0300 |
commit | 5b5a89e3e7b880907f99675a68c5e0a8e2460470 (patch) | |
tree | 17f12e75c1da502d870cfd9313d44ee57055f56c /backends/cloud/googledrive/googledriveuploadrequest.cpp | |
parent | 24b1ec0dedf31097396741aa811dfabf9335b397 (diff) | |
download | scummvm-rg350-5b5a89e3e7b880907f99675a68c5e0a8e2460470.tar.gz scummvm-rg350-5b5a89e3e7b880907f99675a68c5e0a8e2460470.tar.bz2 scummvm-rg350-5b5a89e3e7b880907f99675a68c5e0a8e2460470.zip |
CLOUD: Make Network::ErrorResponse messages more verbose
This commit updates all usages of Network::ErrorResponse to specify at
least method name if not precise reason why operation failed.
Diffstat (limited to 'backends/cloud/googledrive/googledriveuploadrequest.cpp')
-rw-r--r-- | backends/cloud/googledrive/googledriveuploadrequest.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/backends/cloud/googledrive/googledriveuploadrequest.cpp b/backends/cloud/googledrive/googledriveuploadrequest.cpp index c4728c5ac1..1a533e1360 100644 --- a/backends/cloud/googledrive/googledriveuploadrequest.cpp +++ b/backends/cloud/googledrive/googledriveuploadrequest.cpp @@ -55,7 +55,7 @@ void GoogleDriveUploadRequest::start() { _workingRequest->finish(); if (_contentsStream == nullptr || !_contentsStream->seek(0)) { warning("GoogleDriveUploadRequest: cannot restart because stream couldn't seek(0)"); - finishError(Networking::ErrorResponse(this, false, true, "", -1)); + finishError(Networking::ErrorResponse(this, false, true, "GoogleDriveUploadRequest::start: couldn't restart because failed to seek(0)", -1)); return; } _resolvedId = ""; //used to update file contents @@ -146,7 +146,7 @@ void GoogleDriveUploadRequest::startUploadCallback(Networking::JsonResponse resp if (_ignoreCallback) return; - Networking::ErrorResponse error(this, false, true, "", -1); + Networking::ErrorResponse error(this, false, true, "GoogleDriveUploadRequest::startUploadCallback", -1); Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request; if (rq) { const Networking::NetworkReadStream *stream = rq->getNetworkReadStream(); @@ -158,11 +158,19 @@ void GoogleDriveUploadRequest::startUploadCallback(Networking::JsonResponse resp _uploadUrl = headers["location"]; uploadNextPart(); return; + } else { + error.response += ": response must provide Location header, but it's not there"; } + } else { + error.response += ": response is not 200 OK"; } error.httpResponseCode = code; + } else { + error.response += ": missing response stream [improbable]"; } + } else { + error.response += ": missing request object [improbable]"; } Common::JSONValue *json = response.value; @@ -192,7 +200,7 @@ void GoogleDriveUploadRequest::uploadNextPart() { if (oldPos != _serverReceivedBytes) { if (!_contentsStream->seek(_serverReceivedBytes)) { warning("GoogleDriveUploadRequest: cannot upload because stream couldn't seek(%lu)", _serverReceivedBytes); - finishError(Networking::ErrorResponse(this, false, true, "", -1)); + finishError(Networking::ErrorResponse(this, false, true, "GoogleDriveUploadRequest::uploadNextPart: seek() didn't work", -1)); return; } oldPos = _serverReceivedBytes; |