flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-03 16:25:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T614, improved log

Browse Source
This commit is contained in:
Klaus Basan
2019-04-15 15:11:40 +02:00
parent 9e1f437326
commit 4951e7e35f
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackcore/webdataservices.cpp
View File

@@ -1411,10 +1411,13 @@ namespace BlackCore
Q_ASSERT_X(m_dbInfoDataReader, Q_FUNC_INFO, "need reader"); Q_ASSERT_X(m_dbInfoDataReader, Q_FUNC_INFO, "need reader");
// in a dev build all symbols are loaded which sometimes causes unnecessary timeout // in a dev build all symbols are loaded which sometimes causes unnecessary timeout
const int timeOutMs = CBuildConfig::isLocalDeveloperDebugBuild() ? 30 * 1000 : 15 * 1000;
if (m_dbInfoDataReader->areAllInfoObjectsRead()) { return true; } if (m_dbInfoDataReader->areAllInfoObjectsRead()) { return true; }
if (!m_dbInfoObjectTimeout.isValid()) { m_dbInfoObjectTimeout = QDateTime::currentDateTimeUtc().addMSecs(timeOutMs); } const int timeOutMs = 30 * 1000;
if (!m_dbInfoObjectTimeout.isValid())
{
m_dbInfoObjectTimeout = QDateTime::currentDateTimeUtc().addMSecs(timeOutMs);
CLogMessage(this).info(u"Set DbInfoObjects timeout %1ms to %2") << timeOutMs << m_dbInfoObjectTimeout.toString("dd.MM.yyyy hh:mm:ss");
}
const bool read = this->waitForInfoObjectsThenRead(entities, "DB", m_dbInfoDataReader, m_dbInfoObjectTimeout); const bool read = this->waitForInfoObjectsThenRead(entities, "DB", m_dbInfoDataReader, m_dbInfoObjectTimeout);
return read; return read;
} }
@@ -1425,7 +1428,12 @@ namespace BlackCore
Q_ASSERT_X(m_sharedInfoDataReader, Q_FUNC_INFO, "need reader"); Q_ASSERT_X(m_sharedInfoDataReader, Q_FUNC_INFO, "need reader");
if (m_sharedInfoDataReader->areAllInfoObjectsRead()) { return true; } if (m_sharedInfoDataReader->areAllInfoObjectsRead()) { return true; }
if (!m_sharedInfoObjectsTimeout.isValid()) { m_sharedInfoObjectsTimeout = QDateTime::currentDateTimeUtc().addMSecs(15 * 1000); } const int timeOutMs = 30 * 1000;
if (!m_sharedInfoObjectsTimeout.isValid())
{
m_sharedInfoObjectsTimeout = QDateTime::currentDateTimeUtc().addMSecs(timeOutMs);
CLogMessage(this).info(u"Set SharedInfoObjects timeout %1ms to %2") << timeOutMs << m_sharedInfoObjectsTimeout.toString("dd.MM.yyyy hh:mm:ss");
}
const bool read = this->waitForInfoObjectsThenRead(entities, "shared", m_sharedInfoDataReader, m_sharedInfoObjectsTimeout); const bool read = this->waitForInfoObjectsThenRead(entities, "shared", m_sharedInfoDataReader, m_sharedInfoObjectsTimeout);
return read; return read;
} }