From 8c0d82de99e3dfc17eec3494eefcf1b1473fc883 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Fri, 1 Mar 2019 22:30:41 +0000 Subject: [PATCH] Added CDatabaseWriter::getLogCategories. --- src/blackcore/db/databasewriter.cpp | 14 +++++++++++--- src/blackcore/db/databasewriter.h | 3 +++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/blackcore/db/databasewriter.cpp b/src/blackcore/db/databasewriter.cpp index 58d85f682..7767b688b 100644 --- a/src/blackcore/db/databasewriter.cpp +++ b/src/blackcore/db/databasewriter.cpp @@ -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 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); } } diff --git a/src/blackcore/db/databasewriter.h b/src/blackcore/db/databasewriter.h index e389f7743..681dbd9b7 100644 --- a/src/blackcore/db/databasewriter.h +++ b/src/blackcore/db/databasewriter.h @@ -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,