Added CDatabaseWriter::getLogCategories.

This commit is contained in:
Mat Sutcliffe
2019-03-01 22:30:41 +00:00
parent 21a13978a2
commit 8c0d82de99
2 changed files with 14 additions and 3 deletions

View File

@@ -146,9 +146,17 @@ namespace BlackCore
return n;
}
const CLogCategoryList &CDatabaseWriter::getLogCategories()
{
static const CLogCategoryList cats
{
CLogCategory::swiftDbWebservice(), CLogCategory::webservice()
};
return cats;
}
void CDatabaseWriter::postedModelsResponse(QNetworkReply *nwReplyPtr)
{
static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::swiftDbWebservice()}));
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
if (m_shutdown || !sApp)
{
@@ -165,7 +173,7 @@ namespace BlackCore
nwReply->close(); // close asap
if (responseData.isEmpty())
{
const CStatusMessageList msgs({CStatusMessage(cats, CStatusMessage::SeverityError, u"No response data from " % urlString)});
const CStatusMessageList msgs({CStatusMessage(this, CStatusMessage::SeverityError, u"No response data from " % urlString)});
emit this->publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
return;
}
@@ -189,7 +197,7 @@ namespace BlackCore
{
const QString error = nwReply->errorString();
nwReply->close(); // close asap
const CStatusMessageList msgs({CStatusMessage(cats, CStatusMessage::SeverityError, u"HTTP error: " % error)});
const CStatusMessageList msgs({CStatusMessage(this, CStatusMessage::SeverityError, u"HTTP error: " % error)});
emit this->publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
}
}

View File

@@ -58,6 +58,9 @@ namespace BlackCore
//! Write log
const BlackMisc::Network::CUrlLogList &getWriteLog() const { return m_writeLog; }
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
signals:
//! Published models, the response to \sa asyncPublishModels
void publishedModels(const BlackMisc::Simulation::CAircraftModelList &modelsPublished,