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

refs #751, improved model writing to DB

Browse Source 
* a pending request can be aborted when taking too long
* success / directWrite flags in signals
This commit is contained in:
Klaus Basan
2016-09-01 01:01:25 +02:00
committed by Roland Winklmeier
parent ced9f5294e
commit 23ccb35ed8
8 changed files with 75 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/blackcore/db/databasewriter.cpp
View File

@@ -49,6 +49,18 @@ namespace BlackCore
return msgs;
}
if (this->isReplyOverdue())
{
bool killed = this->killPendingReply();
if (killed)
{
const CStatusMessage msg(CStatusMessage::SeverityWarning, "Aborted outdated pending reply");
msgs.push_back(CStatusMessage(msg));
// need to let a potential receiver know it has failed
emit this->publishedModels(CAircraftModelList(), CAircraftModelList(), msg, false, false);
}
}
if (m_pendingReply)
{
msgs.push_back(CStatusMessage(CStatusMessage::SeverityWarning, "Another write operation in progress"));
@@ -66,17 +78,14 @@ namespace BlackCore
}
m_pendingReply = sApp->postToNetwork(request, multiPart, { this, &CDatabaseWriter::ps_postModelsResponse});
m_replyPendingSince = QDateTime::currentMSecsSinceEpoch();
return msgs;
}
void CDatabaseWriter::gracefulShutdown()
{
m_shutdown = true;
if (m_pendingReply)
{
m_pendingReply->abort();
m_pendingReply = nullptr;
}
this->killPendingReply();
}
void CDatabaseWriter::ps_postModelsResponse(QNetworkReply *nwReplyPtr)
@@ -100,26 +109,42 @@ namespace BlackCore
if (dataFileData.isEmpty())
{
const CStatusMessageList msgs({CStatusMessage(cats, CStatusMessage::SeverityError, "No response data from " + urlString)});
emit publishedModels(CAircraftModelList(), CAircraftModelList(), msgs);
emit publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
return;
}
CAircraftModelList modelsPublished;
CAircraftModelList modelsSkipped;
CStatusMessageList msgs;
bool success = CDatastoreUtility::parseSwiftPublishResponse(dataFileData, modelsPublished, modelsSkipped, msgs);
emit publishedModels(modelsPublished, modelsSkipped, msgs);
Q_UNUSED(success);
bool directWrite;
const bool success = CDatastoreUtility::parseSwiftPublishResponse(dataFileData, modelsPublished, modelsSkipped, msgs, directWrite);
emit publishedModels(modelsPublished, modelsSkipped, msgs, success, directWrite);
}
else
{
QString error = nwReply->errorString();
nwReply->close(); // close asap
const CStatusMessageList msgs( {CStatusMessage(cats, CStatusMessage::SeverityError, "HTTP error: " + error)});
emit publishedModels(CAircraftModelList(), CAircraftModelList(), msgs);
emit publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
}
}
bool CDatabaseWriter::killPendingReply()
{
if (!m_pendingReply) { return false; }
m_pendingReply->abort();
m_pendingReply = nullptr;
m_replyPendingSince = -1;
return true;
}
bool CDatabaseWriter::isReplyOverdue() const
{
if (m_replyPendingSince < 0 || !m_pendingReply) { return false; }
qint64 ms = QDateTime::currentMSecsSinceEpoch() - m_replyPendingSince;
return ms > 7500;
}
CUrl CDatabaseWriter::getModelPublishUrl(const Network::CUrl &baseUrl)
{
return baseUrl.withAppendedPath("service/publishmodels.php");

12
src/blackcore/db/databasewriter.h
View File

@@ -44,7 +44,10 @@ namespace BlackCore
signals:
//! Published models, the response to \sa asyncPublishModels
void publishedModels(const BlackMisc::Simulation::CAircraftModelList &modelsPublished, const BlackMisc::Simulation::CAircraftModelList &modelsSkipped, const BlackMisc::CStatusMessageList &messages);
void publishedModels(const BlackMisc::Simulation::CAircraftModelList &modelsPublished,
const BlackMisc::Simulation::CAircraftModelList &modelsSkipped,
const BlackMisc::CStatusMessageList &messages,
bool success, bool directWrite);
private slots:
//! Post response
@@ -53,8 +56,15 @@ namespace BlackCore
private:
BlackMisc::Network::CUrl m_modelPublishUrl;
QNetworkReply *m_pendingReply = nullptr;
qint64 m_replyPendingSince = -1;
bool m_shutdown = false;
//! Kill the pending reply
bool killPendingReply();
//! Reply timed out?
bool isReplyOverdue() const;
//! URL model web service
static BlackMisc::Network::CUrl getModelPublishUrl(const BlackMisc::Network::CUrl &baseUrl);