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

Ref T150, database reader using watchdog

Browse Source 
* removed canConnect DB checks, using watchdog
* changed signature to: int requestHeadersOfSharedFiles
* rely on shared working URL from watchdog
This commit is contained in:
Klaus Basan
2017-09-14 02:32:05 +02:00
committed by Mathew Sutcliffe
parent fdfa2233fb
commit 46d2f2c048
2 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/blackcore/db/databasereader.cpp
View File

@@ -10,6 +10,7 @@
#include "blackcore/db/databasereader.h"
#include "blackcore/db/infodatareader.h"
#include "blackcore/db/databaseutils.h"
#include "blackcore/db/networkwatchdog.h"
#include "blackcore/webdataservices.h"
#include "blackcore/application.h"
#include "blackmisc/db/datastoreutility.h"
@@ -39,13 +40,9 @@ namespace BlackCore
{
namespace Db
{
CUrl CDatabaseReader::s_workingSharedDbData;
CDatabaseReader::CDatabaseReader(QObject *owner, const CDatabaseReaderConfigList &config, const QString &name) :
BlackCore::CThreadedReader(owner, name), m_config(config)
{
CDatabaseReader::initWorkingUrls();
}
{ }
void CDatabaseReader::readInBackgroundThread(CEntityFlags::Entity entities, const QDateTime &newerThan)
{
@@ -291,6 +288,14 @@ namespace BlackCore
{
this->receivedSharedFileHeaderNonClosing(nwReply);
}
else
{
if (dsr.isLoadedFromDb())
{
const bool s = !dsr.hasErrorMessage();
emit this->swiftDbDataRead(s);
}
}
return dsr;
}
@@ -372,20 +377,25 @@ namespace BlackCore
return m_sharedFileResponses[entity].getLastModifiedTimestamp();
}
bool CDatabaseReader::requestHeadersOfSharedFiles(CEntityFlags::Entity entities)
int CDatabaseReader::requestHeadersOfSharedFiles(CEntityFlags::Entity entities)
{
if (!this->isInternetAccessible(QString("No network/internet access, will not read shared file headers for %1").arg(CEntityFlags::flagToString(entities)))) { return false; }
CEntityFlags::Entity allEntities(this->maskBySupportedEntities(entities));
CEntityFlags::Entity currentEntity = CEntityFlags::iterateDbEntities(allEntities);
const CUrl urlSharedData = CGlobalSetup::buildDbDataDirectory(getWorkingDbDataFileLocationUrl());
const CUrl urlSharedDbdata = CDatabaseReader::getWorkingSharedDbdataDirectoryUrl();
if (urlSharedDbdata.isEmpty())
{
CLogMessage(this).warning("No working shared URL, cannot request headers");
return 0;
}
int c = 0;
while (currentEntity != CEntityFlags::NoEntity)
{
const QString fileName = CDbInfo::entityToSharedName(currentEntity);
Q_ASSERT_X(!fileName.isEmpty(), Q_FUNC_INFO, "No file name for entity");
CUrl url = urlSharedData;
CUrl url = urlSharedDbdata;
url.appendPath(fileName);
const QString entityString = CEntityFlags::flagToString(currentEntity);
@@ -497,7 +507,7 @@ namespace BlackCore
return this->getDbServiceBaseUrl().withAppendedPath("/service");
case CDbFlags::SharedInfoOnly:
case CDbFlags::Shared:
return CDatabaseReader::getWorkingDbDataFileLocationUrl();
return CDatabaseReader::getWorkingSharedDbdataDirectoryUrl();
default:
qFatal("Wrong mode");
break;
@@ -525,12 +535,12 @@ namespace BlackCore
nwReply->close();
}
void CDatabaseReader::receivedSharedFileHeaderNonClosing(QNetworkReply *nwReply)
void CDatabaseReader::receivedSharedFileHeaderNonClosing(QNetworkReply *nwReplyPtr)
{
if (this->isAbandoned()) { return; }
const HeaderResponse headerResponse = this->transformReplyIntoHeaderResponse(nwReply);
const QString fileName = nwReply->url().fileName();
const HeaderResponse headerResponse = this->transformReplyIntoHeaderResponse(nwReplyPtr);
const QString fileName = nwReplyPtr->url().fileName();
const CEntityFlags::Entity entity = CEntityFlags::singleEntityByName(fileName);
this->m_sharedFileResponses[entity] = headerResponse;
@@ -650,9 +660,10 @@ namespace BlackCore
return dbUrl;
}
CUrl CDatabaseReader::getWorkingDbDataFileLocationUrl()
CUrl CDatabaseReader::getWorkingSharedDbdataDirectoryUrl()
{
return CDatabaseReader::s_workingSharedDbData;
const CUrl sharedUrl(sApp->getWorkingSharedUrl());
return CGlobalSetup::buildDbDataDirectoryUrl(sharedUrl);
}
void CDatabaseReader::cacheHasChanged(CEntityFlags::Entity entities)
@@ -660,24 +671,6 @@ namespace BlackCore
this->emitReadSignalPerSingleCachedEntity(entities, false);
}
bool CDatabaseReader::canPingSwiftServer()
{
const CUrl url(getDbUrl());
return CNetworkUtils::canConnect(url);
}
bool CDatabaseReader::initWorkingUrls(bool force)
{
if (!force && !CDatabaseReader::s_workingSharedDbData.isEmpty()) { return false; }
CDatabaseReader::s_workingSharedDbData = sApp->getGlobalSetup().getSwiftDbDataFileLocationUrls().getRandomWorkingUrl();
return !CDatabaseReader::s_workingSharedDbData.isEmpty();
}
CUrl CDatabaseReader::getCurrentSharedDbDataUrl()
{
return CDatabaseReader::s_workingSharedDbData;
}
void CDatabaseReader::stringToDatastoreResponse(const QString &jsonContent, JsonDatastoreResponse &datastoreResponse)
{
if (jsonContent.isEmpty())
@@ -709,6 +702,11 @@ namespace BlackCore
}
}
bool CDatabaseReader::JsonDatastoreResponse::isLoadedFromDb() const
{
return CNetworkWatchdog::isDbUrl(this->getUrl());
}
void CDatabaseReader::JsonDatastoreResponse::setJsonArray(const QJsonArray &value)
{
m_jsonArray = value;

32
src/blackcore/db/databasereader.h
View File

@@ -127,6 +127,9 @@ namespace BlackCore
//! Incremental data, restricted by query?
bool isRestricted() const { return m_restricted; }
//! Is loaded from database
bool isLoadedFromDb() const;
//! Mark as restricted
void setRestricted(bool restricted) { m_restricted = restricted; }
@@ -229,8 +232,9 @@ namespace BlackCore
//! Those entities where the timestamp of shared info obejct is newer than the cache timestamp
BlackMisc::Network::CEntityFlags::Entity getEntitesWithNewerSharedInfoObject(BlackMisc::Network::CEntityFlags::Entity entities) const;
//! Request header of shared file
bool requestHeadersOfSharedFiles(BlackMisc::Network::CEntityFlags::Entity entities);
//! Request headers of shared file
//! \return number of requested headers
int requestHeadersOfSharedFiles(BlackMisc::Network::CEntityFlags::Entity entities);
//! Status message (error message)
const QString &getStatusMessage() const;
@@ -241,20 +245,14 @@ namespace BlackCore
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
//! swift DB server reachable?
static bool canPingSwiftServer();
//! Init the working URLs
static bool initWorkingUrls(bool force = false);
//! Currently used URL for shared DB data
static BlackMisc::Network::CUrl getCurrentSharedDbDataUrl();
//! Transform JSON data to response struct data
//! \private used also for samples, that`s why it is declared public
static void stringToDatastoreResponse(const QString &jsonContent, CDatabaseReader::JsonDatastoreResponse &datastoreResponse);
signals:
//! DB have been read
void swiftDbDataRead(bool success);
//! Combined read signal
void dataRead(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number);
@@ -299,15 +297,14 @@ namespace BlackCore
//! Log if no working URL exists, using m_noWorkingUrlSeverity
void logNoWorkingUrl(BlackMisc::Network::CEntityFlags::Entity entity);
//! Base URL
//! Base URL for mode (either a shared or DB URL)
BlackMisc::Network::CUrl getBaseUrl(BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode) const;
//! DB base URL
static const BlackMisc::Network::CUrl &getDbUrl();
//! Get the working shared URL, initialized by CDatabaseReader::initWorkingUrls
//! \remark normally constant after startup phase
static BlackMisc::Network::CUrl getWorkingDbDataFileLocationUrl();
//! Working shared "dbdata" directory URL
static BlackMisc::Network::CUrl getWorkingSharedDbdataDirectoryUrl();
//! File name for given mode, either php service or shared file name
static QString fileNameForMode(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode);
@@ -349,9 +346,6 @@ namespace BlackCore
static bool isChangedUrl(const BlackMisc::Network::CUrl &oldUrl, const BlackMisc::Network::CUrl &currentUrl);
//! @}
private:
static BlackMisc::Network::CUrl s_workingSharedDbData; //!< one choosen URL for all DB reader objects
//! Start reading in own thread (without config/caching)
//! \remarks can handle DB or shared file reads
void startReadFromBackendInBackgroundThread(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan = QDateTime());
@@ -360,7 +354,7 @@ namespace BlackCore
void receivedSharedFileHeader(QNetworkReply *nwReplyPtr);
//! Received a reply of a header for a shared file
void receivedSharedFileHeaderNonClosing(QNetworkReply *nwReply);
void receivedSharedFileHeaderNonClosing(QNetworkReply *nwReplyPtr);
//! Check if terminated or error, otherwise split into array of objects
JsonDatastoreResponse transformReplyIntoDatastoreResponse(QNetworkReply *nwReply) const;