flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 18:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reset URL list and adjusted timeouts for for bootstrap file. Also avoid problems when shutting down.

Browse Source
This commit is contained in:
Klaus Basan
2018-04-09 22:49:57 +02:00
committed by Roland Winklmeier
parent 631ffdb191
commit e1421622b1
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackcore/setupreader.cpp
View File

@@ -76,8 +76,8 @@ namespace BlackCore
const CGlobalSetup cachedSetup = m_setup.get();
const bool cacheAvailable = cachedSetup.wasLoaded();
msgs.push_back(cacheAvailable ?
CStatusMessage(this, CStatusMessage::SeverityInfo , "Cached setup synchronized and contains data") :
CStatusMessage(this, CStatusMessage::SeverityInfo , "Cached setup synchronized, but no data in cache"));
CStatusMessage(this, CStatusMessage::SeverityInfo, "Cached setup synchronized and contains data") :
CStatusMessage(this, CStatusMessage::SeverityInfo, "Cached setup synchronized, but no data in cache"));
if (m_bootstrapMode == CacheOnly)
{
@@ -218,7 +218,7 @@ namespace BlackCore
CStatusMessageList CSetupReader::triggerReadSetup()
{
if (m_shutdown) { return CStatusMessage(this, CStatusMessage::SeverityError, "shutdown"); }
if (!sApp || m_shutdown) { return CStatusMessage(this, CStatusMessage::SeverityError, "shutdown"); }
if (!sApp->isInternetAccessible())
{
const CStatusMessage m(this, CStatusMessage::SeverityInfo, "No network/internet, will try to recover");
@@ -228,9 +228,10 @@ namespace BlackCore
return msgs;
}
const CUrl url(m_bootstrapUrls.obtainNextWorkingUrl());
const CUrl url(m_bootstrapUrls.obtainNextWorkingUrl(false, CNetworkUtils::getLongTimeoutMs()));
if (url.isEmpty())
{
m_bootstrapUrls.reset();
const CStatusMessage m(this, CStatusMessage::SeverityError,
"Cannot read setup, URLs: " + m_bootstrapUrls.toQString() +
" failed URLs: " + m_bootstrapUrls.getFailedUrls().toQString());