Ref T149, use URL in DB writer

This commit is contained in:
Klaus Basan
2017-09-10 23:35:37 +02:00
committed by Mathew Sutcliffe
parent b9760b4c60
commit 17d2243e3f
2 changed files with 16 additions and 1 deletions

View File

@@ -87,7 +87,8 @@ namespace BlackCore
if (compress) { url.setQuery(CDatabaseUtils::getCompressedQuery()); }
QNetworkRequest request(url);
CNetworkUtils::ignoreSslVerification(request);
m_pendingReply = sApp->postToNetwork(request, multiPart, { this, &CDatabaseWriter::ps_postModelsResponse});
int logId = m_writeLog.addPendingUrl(url);
m_pendingReply = sApp->postToNetwork(request, logId, multiPart, { this, &CDatabaseWriter::ps_postModelsResponse});
m_replyPendingSince = QDateTime::currentMSecsSinceEpoch();
return msgs;
}
@@ -98,6 +99,12 @@ namespace BlackCore
this->killPendingReply();
}
const QString &CDatabaseWriter::getName()
{
static const QString n("Database writer");
return n;
}
void CDatabaseWriter::ps_postModelsResponse(QNetworkReply *nwReplyPtr)
{
static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::swiftDbWebservice()}));

View File

@@ -14,6 +14,7 @@
#include "blackcore/blackcoreexport.h"
#include "blackmisc/network/url.h"
#include "blackmisc/network/urlloglist.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/statusmessagelist.h"
@@ -48,6 +49,12 @@ namespace BlackCore
//! Shutting down?
bool isShuttingDown() const { return m_shutdown; }
//! Name of the worker
const QString &getName();
//! Write log
const BlackMisc::Network::CUrlLogList &getWriteLog() const { return m_writeLog; }
signals:
//! Published models, the response to \sa asyncPublishModels
void publishedModels(const BlackMisc::Simulation::CAircraftModelList &modelsPublished,
@@ -60,6 +67,7 @@ namespace BlackCore
void ps_postModelsResponse(QNetworkReply *nwReplyPtr);
private:
BlackMisc::Network::CUrlLogList m_writeLog;
BlackMisc::Network::CUrl m_modelPublishUrl;
QNetworkReply *m_pendingReply = nullptr;
qint64 m_replyPendingSince = -1;