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

Minor fixes related to the SSL lib issue

Browse Source 
https://discordapp.com/channels/539048679160676382/539925070550794240/691469857891418202
This commit is contained in:
Klaus Basan
2020-03-23 22:28:35 +01:00
committed by Mat Sutcliffe
parent 1e789c0951
commit 76e42cc16e
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/application.cpp
View File

@@ -430,7 +430,7 @@ namespace BlackCore
return msgs; return msgs;
} }
// getting here can means no "real" read success, and NO available cache // getting here means no "real" read success, and NO available cache
msgs.push_back(CStatusMessage(this).error(u"Setup not available, setup reading failed or timed out.")); msgs.push_back(CStatusMessage(this).error(u"Setup not available, setup reading failed or timed out."));
if (m_setupReader->getLastSetupReadErrorMessages().hasErrorMessages()) if (m_setupReader->getLastSetupReadErrorMessages().hasErrorMessages())
{ {
@@ -451,7 +451,7 @@ namespace BlackCore
CStatusMessageList CApplication::requestReloadOfSetupAndVersion() CStatusMessageList CApplication::requestReloadOfSetupAndVersion()
{ {
if (m_shutdown) { return CStatusMessage(this).warning(u"Shutting down, not reading"); } if (m_shutdown) { return CStatusMessage(this).warning(u"Shutting down, not reading"); }
if (!m_setupReader) { return CStatusMessage(this).error(u"No reader for setup/version"); } if (!m_setupReader) { return CStatusMessage(this).error(u"No reader for setup/version"); }
Q_ASSERT_X(m_parsed, Q_FUNC_INFO, "Not yet parsed"); Q_ASSERT_X(m_parsed, Q_FUNC_INFO, "Not yet parsed");
return m_setupReader->asyncLoad(); return m_setupReader->asyncLoad();

4
src/blackcore/setupreader.cpp
View File

@@ -79,7 +79,7 @@ namespace BlackCore
{ {
m_updateInfoUrls = cachedSetup.getSwiftUpdateInfoFileUrls(); // we use the info URLs from cached setup m_updateInfoUrls = cachedSetup.getSwiftUpdateInfoFileUrls(); // we use the info URLs from cached setup
msgs.push_back(cacheAvailable ? msgs.push_back(cacheAvailable ?
CStatusMessage(this, CStatusMessage::SeverityInfo, u"Cache only setup, using it as it is") : CStatusMessage(this, CStatusMessage::SeverityInfo, u"Cache only setup, using it as it is") :
CStatusMessage(this, CStatusMessage::SeverityError, u"Cache only setup, but cache is empty")); CStatusMessage(this, CStatusMessage::SeverityError, u"Cache only setup, but cache is empty"));
msgs.push_back(this->manageSetupAvailability(false, false)); // treat cache as local read msgs.push_back(this->manageSetupAvailability(false, false)); // treat cache as local read
return msgs; return msgs;
@@ -116,7 +116,7 @@ namespace BlackCore
if (m_bootstrapUrls.isEmpty()) if (m_bootstrapUrls.isEmpty())
{ {
// after all still empty // after all still empty
msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityInfo, u"Your log files are here: " % CDirectoryUtils::logDirectory())); msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityInfo, u"Your log files are here: " % CDirectoryUtils::logDirectory()));
msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityError, u"No bootstrap URLs, cannot load setup")); msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityError, u"No bootstrap URLs, cannot load setup"));
} }
else else

3
src/blackcore/webdataservices.cpp
View File

@@ -65,6 +65,9 @@ namespace BlackCore
Q_ASSERT_X(sApp->isSetupAvailable(), Q_FUNC_INFO, "Setup not synchronized"); Q_ASSERT_X(sApp->isSetupAvailable(), Q_FUNC_INFO, "Setup not synchronized");
this->setObjectName("CWebDataServices"); this->setObjectName("CWebDataServices");
// SSL INFOs
CLogMessage(this).info(u"SSL supported: %1 Version: %2 (build version) %3 (library version)") << boolToYesNo(QSslSocket::supportsSsl()) << QSslSocket::sslLibraryBuildVersionString() << QSslSocket::sslLibraryVersionString();
// check if I need info objects // check if I need info objects
const bool readFromSwiftDb = dbReaderConfig.possiblyReadsFromSwiftDb(); // DB read access const bool readFromSwiftDb = dbReaderConfig.possiblyReadsFromSwiftDb(); // DB read access
const bool writeToSwiftDb = dbReaderConfig.possiblyWritesToSwiftDb(); // DB write access const bool writeToSwiftDb = dbReaderConfig.possiblyWritesToSwiftDb(); // DB write access