Timeout for blocking network requests in content cache should match

nyalldawson · rldhont · commit d353850f81c9 · 2020-05-21T20:14:36.000+02:00
the user's preset network timeout value, not a hardcoded value
diff --git a/src/core/qgsabstractcontentcache.h b/src/core/qgsabstractcontentcache.h
@@ -447,7 +447,7 @@ class CORE_EXPORT QgsAbstractContentCache : public QgsAbstractContentCacheBase
     }
 
     /**
-     * Blocks the current thread until the \a task finishes or an arbitrary setting maximum wait to 5 seconds
+     * Blocks the current thread until the \a task finishes (or user's preset network timeout expires)
      *
      * \warning this method must NEVER be used from GUI based applications (like the main QGIS application)
      * or crashes will result. Only for use in external scripts or QGIS server.
@@ -458,8 +458,8 @@ class CORE_EXPORT QgsAbstractContentCache : public QgsAbstractContentCacheBase
      */
     bool waitForTaskFinished( QgsNetworkContentFetcherTask *task ) const
     {
-      // Second step, wait 5 seconds for task finished
-      if ( task->waitForFinished( 5000 ) )
+      // Wait up to timeout seconds for task finished
+      if ( task->waitForFinished( QgsNetworkAccessManager::timeout() ) )
       {
         // The wait did not time out
         // Third step, check status as complete

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ class CORE_EXPORT QgsAbstractContentCache : public QgsAbstractContentCacheBase`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`/**`
`450`		`- * Blocks the current thread until the \a task finishes or an arbitrary setting maximum wait to 5 seconds`
	`450`	`+ * Blocks the current thread until the \a task finishes (or user's preset network timeout expires)`
`451`	`451`	`*`
`452`	`452`	`* \warning this method must NEVER be used from GUI based applications (like the main QGIS application)`
`453`	`453`	`* or crashes will result. Only for use in external scripts or QGIS server.`
`@@ -458,8 +458,8 @@ class CORE_EXPORT QgsAbstractContentCache : public QgsAbstractContentCacheBase`
`458`	`458`	`*/`
`459`	`459`	`bool waitForTaskFinished( QgsNetworkContentFetcherTask *task ) const`
`460`	`460`	`{`
`461`		`- // Second step, wait 5 seconds for task finished`
`462`		`- if ( task->waitForFinished( 5000 ) )`
	`461`	`+ // Wait up to timeout seconds for task finished`
	`462`	`+ if ( task->waitForFinished( QgsNetworkAccessManager::timeout() ) )`
`463`	`463`	`{`
`464`	`464`	`// The wait did not time out`
`465`	`465`	`// Third step, check status as complete`