Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use consistant default value of 60000ms for /qgis/networkAndProxy/net…
…workTimeout

Currently there's an inconsistancy between the Options dialog that displays a
default value of 60000ms for network request timeouts, whereas places in the
code use 20000ms. I propose to align on 60000s, since there are occurrences
of network requests, for example big WFS GetFeature requests, that can take
more than 20s to start.

(cherry picked from commit f387291)

(testqgswcspublicservers.cpp update added)
  • Loading branch information
rouault authored and jef-n committed Mar 24, 2016
1 parent 363050d commit 2f7d4a7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Expand Up @@ -11068,7 +11068,7 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors
{
QgsDebugMsg( "Restarting network reply timeout" );
timer->setSingleShot( true );
timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt() );
timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt() );
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgshttptransaction.cpp
Expand Up @@ -58,7 +58,7 @@ QgsHttpTransaction::QgsHttpTransaction( const QString& uri,
Q_UNUSED( userName );
Q_UNUSED( password );
QSettings s;
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt();
}

QgsHttpTransaction::QgsHttpTransaction()
Expand All @@ -69,7 +69,7 @@ QgsHttpTransaction::QgsHttpTransaction()
, mWatchdogTimer( nullptr )
{
QSettings s;
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt();
}

QgsHttpTransaction::~QgsHttpTransaction()
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsnetworkaccessmanager.cpp
Expand Up @@ -217,7 +217,7 @@ QNetworkReply *QgsNetworkAccessManager::createRequest( QNetworkAccessManager::Op
timer->setObjectName( "timeoutTimer" );
connect( timer, SIGNAL( timeout() ), this, SLOT( abortRequest() ) );
timer->setSingleShot( true );
timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt() );
timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt() );

connect( reply, SIGNAL( downloadProgress( qint64, qint64 ) ), timer, SLOT( start() ) );
connect( reply, SIGNAL( uploadProgress( qint64, qint64 ) ), timer, SLOT( start() ) );
Expand Down
2 changes: 1 addition & 1 deletion tests/src/providers/testqgswcspublicservers.cpp
Expand Up @@ -78,7 +78,7 @@ void TestQgsWcsPublicServers::init()
// Unfortunately this seems to be the only way to set timeout, we try to reset it
// at the end but it can be canceled before ...
QSettings settings;
mOrigTimeout = settings.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();
mOrigTimeout = settings.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt();
settings.setValue( "/qgis/networkAndProxy/networkTimeout", mTimeout );

//mCacheDir = QDir( "./wcstestcache" );
Expand Down

1 comment on commit 2f7d4a7

@pka
Copy link
Member

@pka pka commented on 2f7d4a7 Mar 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

60s is a big pain if you're working with (sometimes failing) webservices. Default value should be much lower, but there seem to be buggy timeouts at least on startup.

Please sign in to comment.