Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 08:59:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a five second download timeout timer: if that much time passes without

Browse source 
any progress, consider it an error.
This commit is contained in:
Andrzej Kapolka 2014-03-06 14:31:13 -08:00
parent a39b0313c9
commit 1468bd1b49
2 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libraries/shared/src/ResourceCache.cpp
View file

@ -9,7 +9,6 @@
#include <cfloat> #include <cfloat>
#include <cmath> #include <cmath>
#include <QNetworkReply>
#include <QTimer> #include <QTimer>
#include <QtDebug> #include <QtDebug>
@ -156,25 +155,51 @@ void Resource::finishedLoading(bool success) {
_loadPriorities.clear(); _loadPriorities.clear();
} }
const int REPLY_TIMEOUT_MS = 5000;
void Resource::handleDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) { void Resource::handleDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) {
if (!_reply->isFinished()) { if (!_reply->isFinished()) {
_replyTimer->start(REPLY_TIMEOUT_MS);
return; return;
} }
_reply->disconnect(this); _reply->disconnect(this);
QNetworkReply* reply = _reply; QNetworkReply* reply = _reply;
_reply = NULL; _reply = NULL;
_replyTimer->disconnect(this);
_replyTimer->deleteLater();
_replyTimer = NULL;
ResourceCache::requestCompleted(); ResourceCache::requestCompleted();
downloadFinished(reply); downloadFinished(reply);
} }
void Resource::handleReplyError() { void Resource::handleReplyError() {
QDebug debug = qDebug() << _reply->errorString(); handleReplyError(_reply->error(), qDebug() << _reply->errorString());
}
void Resource::handleReplyTimeout() {
handleReplyError(QNetworkReply::TimeoutError, qDebug() << "Timed out loading" << _reply->url());
}
void Resource::makeRequest() {
_reply = ResourceCache::getNetworkAccessManager()->get(_request);
QNetworkReply::NetworkError error = _reply->error(); connect(_reply, SIGNAL(downloadProgress(qint64,qint64)), SLOT(handleDownloadProgress(qint64,qint64)));
connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(handleReplyError()));
_replyTimer = new QTimer(this);
connect(_replyTimer, SIGNAL(timeout()), SLOT(handleReplyTimeout()));
_replyTimer->setSingleShot(true);
_replyTimer->start(REPLY_TIMEOUT_MS);
}
void Resource::handleReplyError(QNetworkReply::NetworkError error, QDebug debug) {
_reply->disconnect(this); _reply->disconnect(this);
_reply->deleteLater(); _reply->deleteLater();
_reply = NULL; _reply = NULL;
_replyTimer->disconnect(this);
_replyTimer->deleteLater();
_replyTimer = NULL;
ResourceCache::requestCompleted(); ResourceCache::requestCompleted();
// retry for certain types of failures // retry for certain types of failures
@ -193,7 +218,7 @@ void Resource::handleReplyError() {
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, SLOT(attemptRequest()));
debug << " -- retrying..."; debug << "-- retrying...";
return; return;
} }
// fall through to final failure // fall through to final failure
@ -204,13 +229,6 @@ void Resource::handleReplyError() {
} }
} }
void Resource::makeRequest() {
_reply = ResourceCache::getNetworkAccessManager()->get(_request);
connect(_reply, SIGNAL(downloadProgress(qint64,qint64)), SLOT(handleDownloadProgress(qint64,qint64)));
connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(handleReplyError()));
}
uint qHash(const QPointer<QObject>& value, uint seed) { uint qHash(const QPointer<QObject>& value, uint seed) {
return qHash(value.data(), seed); return qHash(value.data(), seed);
} }

6
libraries/shared/src/ResourceCache.h
View file

@ -11,6 +11,7 @@
#include <QHash> #include <QHash>
#include <QList> #include <QList>
#include <QNetworkReply>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QObject> #include <QObject>
#include <QPointer> #include <QPointer>
@ -20,6 +21,7 @@
class QNetworkAccessManager; class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class QTimer;
class Resource; class Resource;
@ -116,14 +118,18 @@ private slots:
void handleDownloadProgress(qint64 bytesReceived, qint64 bytesTotal); void handleDownloadProgress(qint64 bytesReceived, qint64 bytesTotal);
void handleReplyError(); void handleReplyError();
void handleReplyTimeout();
private: private:
void makeRequest(); void makeRequest();
void handleReplyError(QNetworkReply::NetworkError error, QDebug debug);
friend class ResourceCache; friend class ResourceCache;
QNetworkReply* _reply; QNetworkReply* _reply;
QTimer* _replyTimer;
int _attempts; int _attempts;
}; };