mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-17 17:31:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add additional trace information for downloads

Browse Source
This commit is contained in:
Alexander Bock
2018-09-02 13:33:49 -04:00
parent f429959bba
commit ff1cd82f64
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/httprequest.cpp
View File

@@ -193,7 +193,10 @@ bool HttpDownload::callOnProgress(HttpRequest::Progress p) {
SyncHttpDownload::SyncHttpDownload(std::string url) : _httpRequest(std::move(url)) {}
void SyncHttpDownload::download(HttpRequest::RequestOptions opt) {
LTRACE(fmt::format("Start sync download '{}'", _httpRequest.url()));
if (!initDownload()) {
LERROR(fmt::format("Failed sync download '{}'", _httpRequest.url()));
markAsFailed();
return;
}
@@ -207,13 +210,17 @@ void SyncHttpDownload::download(HttpRequest::RequestOptions opt) {
});
_httpRequest.onReadyStateChange([this](HttpRequest::ReadyState rs) {
if (rs == HttpRequest::ReadyState::Success) {
LTRACE(fmt::format("Finished sync download '{}'", _httpRequest.url()));
markAsSuccessful();
} else if (rs == HttpRequest::ReadyState::Fail) {
LERROR(fmt::format("Failed sync download '{}'", _httpRequest.url()));
markAsFailed();
}
});
_httpRequest.perform(opt);
deinitDownload();
LTRACE(fmt::format("End sync download '{}'", _httpRequest.url()));
}
const std::string& SyncHttpDownload::url() const {
@@ -254,6 +261,8 @@ void AsyncHttpDownload::wait() {
}
void AsyncHttpDownload::download(HttpRequest::RequestOptions opt) {
LTRACE(fmt::format("Start async download '{}'", _httpRequest.url()));
initDownload();
_httpRequest.onData([this](HttpRequest::Data d) {
@@ -276,9 +285,11 @@ void AsyncHttpDownload::download(HttpRequest::RequestOptions opt) {
_httpRequest.onReadyStateChange([this](HttpRequest::ReadyState rs) {
if (rs == HttpRequest::ReadyState::Success) {
LTRACE(fmt::format("Finished async download '{}'", _httpRequest.url()));
markAsSuccessful();
}
else if (rs == HttpRequest::ReadyState::Fail) {
LTRACE(fmt::format("Failed async download '{}'", _httpRequest.url()));
markAsFailed();
}
});
@@ -289,6 +300,7 @@ void AsyncHttpDownload::download(HttpRequest::RequestOptions opt) {
}
_downloadFinishCondition.notify_all();
deinitDownload();
LTRACE(fmt::format("End async download '{}'", _httpRequest.url()));
}
const std::string& AsyncHttpDownload::url() const {