mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 03:58:07 +02:00
Some code cleanup
This commit is contained in:
parent
15e9797827
commit
9a9c703a78
1 changed files with 6 additions and 7 deletions
|
@ -372,30 +372,29 @@ void Resource::handleReplyFinished() {
|
||||||
_data = _request->getData();
|
_data = _request->getData();
|
||||||
qDebug() << "Request finished for " << _url << ", " << _activeUrl;
|
qDebug() << "Request finished for " << _url << ", " << _activeUrl;
|
||||||
|
|
||||||
finishedLoading(false);
|
finishedLoading(true);
|
||||||
emit loaded(_data);
|
emit loaded(_data);
|
||||||
downloadFinished(_data);
|
downloadFinished(_data);
|
||||||
} else {
|
} else {
|
||||||
if (result == ResourceRequest::Result::Timeout) {
|
|
||||||
qDebug() << "Timed out loading" << _url << "received" << _bytesReceived << "total" << _bytesTotal;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (result) {
|
switch (result) {
|
||||||
case ResourceRequest::Result::Timeout:
|
case ResourceRequest::Result::Timeout:
|
||||||
|
qDebug() << "Timed out loading" << _url << "received" << _bytesReceived << "total" << _bytesTotal;
|
||||||
|
// Fall through to other cases
|
||||||
case ResourceRequest::Result::ServerUnavailable:
|
case ResourceRequest::Result::ServerUnavailable:
|
||||||
case ResourceRequest::Result::Error: {
|
case ResourceRequest::Result::Error: {
|
||||||
// retry with increasing delays
|
// retry with increasing delays
|
||||||
const int MAX_ATTEMPTS = 8;
|
const int MAX_ATTEMPTS = 8;
|
||||||
const int BASE_DELAY_MS = 1000;
|
const int BASE_DELAY_MS = 1000;
|
||||||
if (++_attempts < MAX_ATTEMPTS) {
|
if (++_attempts < MAX_ATTEMPTS) {
|
||||||
QTimer::singleShot(BASE_DELAY_MS * (int)pow(2.0, _attempts), this, SLOT(attemptRequest()));
|
QTimer::singleShot(BASE_DELAY_MS * (int)pow(2.0, _attempts), this, &Resource::attemptRequest);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// fall through to final failure
|
// fall through to final failure
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
qDebug() << "Error loading " << _url;
|
qDebug() << "Error loading " << _url;
|
||||||
auto error = (result == ResourceRequest::Timeout) ? QNetworkReply::TimeoutError : QNetworkReply::UnknownNetworkError;
|
auto error = (result == ResourceRequest::Timeout) ? QNetworkReply::TimeoutError
|
||||||
|
: QNetworkReply::UnknownNetworkError;
|
||||||
emit failed(error);
|
emit failed(error);
|
||||||
finishedLoading(false);
|
finishedLoading(false);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue