mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a timeout when using the QNAM propagation

Browse Source
This commit is contained in:
Olivier Goffart 2014-04-30 17:54:14 +02:00
parent 7f7154ed40
commit 88cb047197
3 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mirall/networkjobs.h
View File

@ -63,8 +63,6 @@ public:
void setReply(QNetworkReply *reply);
QNetworkReply* reply() const { return _reply; }
void setTimeout(qint64 msec);
void resetTimeout();
void setIgnoreCredentialFailure(bool ignore);
bool ignoreCredentialFailure() const { return _ignoreCredentialFailure; }
@ -72,6 +70,9 @@ public:
QString responseTimestamp();
quint64 duration();
public slots:
void setTimeout(qint64 msec);
void resetTimeout();
signals:
void networkError(QNetworkReply *reply);
protected:

49
src/mirall/propagator_qnam.cpp
View File

@ -26,6 +26,29 @@
namespace Mirall {
static uint chunkSize() {
static uint chunkSize;
if (!chunkSize) {
chunkSize = qgetenv("OWNCLOUD_CHUNK_SIZE").toUInt();
if (chunkSize == 0) {
chunkSize = 10*1024*1024; // default to 10 MiB
}
}
return chunkSize;
}
static qint64 httpTimeout() {
static uint timeout;
if (!timeout) {
timeout = qgetenv("OWNCLOUD_TIMEOUT").toUInt();
if (timeout == 0) {
timeout = 30; // default to 30 secs
}
}
return timeout;
}
/**
* Fiven an error from the network, map to a SyncFileItem::Status error
*/
@ -61,19 +84,14 @@ void PUTFileJob::start() {
}
connect(reply(), SIGNAL(uploadProgress(qint64,qint64)), this, SIGNAL(uploadProgress(qint64,qint64)));
connect(reply(), SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(resetTimeout()));
AbstractNetworkJob::start();
}
static uint chunkSize() {
static uint chunkSize;
if (!chunkSize) {
chunkSize = qgetenv("OWNCLOUD_CHUNK_SIZE").toUInt();
if (chunkSize == 0) {
chunkSize = 10*1024*1024; // default to 10 MiB
}
}
return chunkSize;
void PUTFileJob::slotTimeout() {
_errorString = tr("Connection Timeout");
reply()->abort();
}
void PropagateUploadFileQNAM::start()
@ -215,6 +233,7 @@ void PropagateUploadFileQNAM::startNextChunk()
device->open(QIODevice::ReadOnly);
_job = new PUTFileJob(AccountManager::instance()->account(), _propagator->_remoteFolder + path, device, headers);
_job->setTimeout(httpTimeout() * 1000);
connect(_job, SIGNAL(finishedSignal()), this, SLOT(slotPutFinished()));
connect(_job, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(slotUploadProgress(qint64,qint64)));
_job->start();
@ -240,7 +259,7 @@ void PropagateUploadFileQNAM::slotPutFinished()
"It is restored and your edit is in the conflict file."))) {
return;
}
QString errorString = job->reply()->errorString();
QString errorString = job->errorString();
QByteArray replyContent = job->reply()->readAll();
qDebug() << replyContent; // display the XML error in the debug
@ -418,6 +437,7 @@ void GETFileJob::slotReadyRead()
return;
}
}
resetTimeout();
}
@ -493,6 +513,7 @@ void PropagateDownloadFileQNAM::start()
_job = new GETFileJob(AccountManager::instance()->account(),
_propagator->_remoteFolder + _item._file,
&_tmpFile, headers, expectedEtagForResume);
_job->setTimeout(httpTimeout() * 1000);
connect(_job, SIGNAL(finishedSignal()), this, SLOT(slotGetFinished()));
connect(_job, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(slotDownloadProgress(qint64,qint64)));
_propagator->_activeJobs ++;
@ -611,5 +632,13 @@ void PropagateDownloadFileQNAM::abort()
_job->reply()->abort();
}
void GETFileJob::slotTimeout()
{
_errorString = tr("Connection Timeout");
_errorStatus = SyncFileItem::FatalError;
reply()->abort();
}
}

11
src/mirall/propagator_qnam.h
View File

@ -53,6 +53,7 @@ class PUTFileJob : public AbstractNetworkJob {
Q_OBJECT
QIODevice* _device;
QMap<QByteArray, QByteArray> _headers;
QString _errorString;
public:
// Takes ownership of the device
@ -67,6 +68,13 @@ public:
return true;
}
QString errorString() {
return _errorString.isEmpty() ? reply()->errorString() : _errorString;
};
virtual void slotTimeout();
signals:
void finishedSignal();
void uploadProgress(qint64,qint64);
@ -124,6 +132,9 @@ public:
SyncFileItem::Status errorStatus() { return _errorStatus; }
virtual void slotTimeout();
signals:
void finishedSignal();
void downloadProgress(qint64,qint64);