From 874b517e23ab09e2e26db0213323fde40dff4b93 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 12 Jul 2017 18:56:25 +0200 Subject: [PATCH] Ref T104, use unified log function and removed some redundant log messages --- src/blackcore/db/airportdatareader.cpp | 6 +++--- src/blackcore/db/icaodatareader.cpp | 13 +++++++------ src/blackcore/vatsim/vatsimbookingreader.cpp | 2 -- src/blackcore/vatsim/vatsimdatafilereader.cpp | 10 ++++++---- src/blackcore/vatsim/vatsimmetarreader.cpp | 5 ++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/blackcore/db/airportdatareader.cpp b/src/blackcore/db/airportdatareader.cpp index cbc695578..85c563112 100644 --- a/src/blackcore/db/airportdatareader.cpp +++ b/src/blackcore/db/airportdatareader.cpp @@ -12,7 +12,6 @@ #include "blackcore/application.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/logmessage.h" -#include "blackmisc/verify.h" #include using namespace BlackMisc; @@ -175,8 +174,9 @@ namespace BlackCore if (!inconsistent.isEmpty()) { - BLACK_AUDIT_X(false, Q_FUNC_INFO, "Inconsistent aircraft codes"); - CLogMessage(this).warning("Inconsistent airports: %1") << inconsistent.dbKeysAsStrings(", "); + logInconsistentData( + CStatusMessage(this, CStatusMessage::SeverityInfo, "Inconsistent airports: " + inconsistent.dbKeysAsStrings(", ")), + Q_FUNC_INFO); } const int size = airports.size(); diff --git a/src/blackcore/db/icaodatareader.cpp b/src/blackcore/db/icaodatareader.cpp index 868726ebc..c8d7524e1 100644 --- a/src/blackcore/db/icaodatareader.cpp +++ b/src/blackcore/db/icaodatareader.cpp @@ -15,7 +15,6 @@ #include "blackmisc/json.h" #include "blackmisc/logmessage.h" #include "blackmisc/statusmessage.h" -#include "blackmisc/verify.h" #include #include @@ -257,8 +256,9 @@ namespace BlackCore if (!inconsistent.isEmpty()) { - BLACK_AUDIT_X(false, Q_FUNC_INFO, "Inconsistent aircraft codes"); - CLogMessage(this).warning("Inconsistent aircraft codes: %1") << inconsistent.dbKeysAsStrings(", "); + logInconsistentData( + CStatusMessage(this, CStatusMessage::SeverityInfo, "Inconsistent aircraft codes: " + inconsistent.dbKeysAsStrings(", ")), + Q_FUNC_INFO); } const int n = codes.size(); @@ -301,13 +301,14 @@ namespace BlackCore else { // normally read from special view which already filters incomplete - codes = CAirlineIcaoCodeList::fromDatabaseJson(res, true, &inconsistent); + codes = CAirlineIcaoCodeList::fromDatabaseJson(res, true, &inconsistent); } if (!inconsistent.isEmpty()) { - BLACK_AUDIT_X(false, Q_FUNC_INFO, "Inconsistent airline codes"); - CLogMessage(this).warning("Inconsistent airline codes: %1") << inconsistent.dbKeysAsStrings(", "); + logInconsistentData( + CStatusMessage(this, CStatusMessage::SeverityInfo, "Inconsistent airline codes: " + inconsistent.dbKeysAsStrings(", ")), + Q_FUNC_INFO); } const int n = codes.size(); diff --git a/src/blackcore/vatsim/vatsimbookingreader.cpp b/src/blackcore/vatsim/vatsimbookingreader.cpp index dc6248485..76a0c8eb8 100644 --- a/src/blackcore/vatsim/vatsimbookingreader.cpp +++ b/src/blackcore/vatsim/vatsimbookingreader.cpp @@ -83,7 +83,6 @@ namespace BlackCore // Worker thread, make sure to write no members here od do it threadsafe if (!this->doWorkCheck()) { - CLogMessage(this).debug() << Q_FUNC_INFO; CLogMessage(this).info("Terminated booking parsing process"); return; // stop, terminate straight away, ending thread } @@ -128,7 +127,6 @@ namespace BlackCore { if (!this->doWorkCheck()) { - CLogMessage(this).debug() << Q_FUNC_INFO; CLogMessage(this).info("Terminated booking parsing process"); // for users return; // stop, terminate straight away, ending thread } diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp index 5fbf5f7e1..841620e2c 100644 --- a/src/blackcore/vatsim/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp @@ -205,7 +205,6 @@ namespace BlackCore this->threadAssertCheck(); if (!this->doWorkCheck()) { - CLogMessage(this).debug() << Q_FUNC_INFO; CLogMessage(this).info("Terminated VATSIM file parsing process"); return; // stop, terminate straight away, ending thread } @@ -242,7 +241,6 @@ namespace BlackCore { if (!this->doWorkCheck()) { - CLogMessage(this).debug() << Q_FUNC_INFO; CLogMessage(this).info("Terminated VATSIM file parsing process"); // for users return; // stop, terminate straight away, ending thread } @@ -414,7 +412,9 @@ namespace BlackCore // warnings, if required if (!illegalIcaoCodes.isEmpty()) { - CLogMessage(this).info("Illegal / ignored ICAO code(s) in VATSIM data file: %1") << illegalIcaoCodes.join(", "); + logInconsistentData( + CStatusMessage(this, CStatusMessage::SeverityInfo, "Illegal / ignored ICAO code(s) in VATSIM data file: " + illegalIcaoCodes.join(", ")) + ); } // data read finished @@ -446,7 +446,9 @@ namespace BlackCore if (currentLine.endsWith(':')) { clientParts.removeLast(); } if (clientParts.size() != clientSectionAttributes.size()) { - CLogMessage(getLogCategories()).warning("Client parts: %1 attributes: %2 line: '%3'") << clientParts.size() << clientSectionAttributes.size() << currentLine; + logInconsistentData( + CStatusMessage(static_cast(nullptr), CStatusMessage::SeverityInfo, QString("Client parts: %1 attributes: %2 line: '%3'").arg(clientParts.size()).arg(clientSectionAttributes.size()).arg(currentLine)) + ); return parts; } diff --git a/src/blackcore/vatsim/vatsimmetarreader.cpp b/src/blackcore/vatsim/vatsimmetarreader.cpp index 9bea1361c..e48426b27 100644 --- a/src/blackcore/vatsim/vatsimmetarreader.cpp +++ b/src/blackcore/vatsim/vatsimmetarreader.cpp @@ -95,8 +95,7 @@ namespace BlackCore this->threadAssertCheck(); if (!this->doWorkCheck()) { - CLogMessage(this).debug() << Q_FUNC_INFO; - CLogMessage(this).info("terminated METAR decoding process"); // for users + CLogMessage(this).info("Terminated METAR decoding process"); // for users return; // stop, terminate straight away, ending thread } @@ -117,7 +116,7 @@ namespace BlackCore while (!lineReader.atEnd()) { if (!this->doWorkCheck()) { return; } - QString line = lineReader.readLine(); + const QString line = lineReader.readLine(); CMetar metar = m_metarDecoder.decode(line); if (metar != CMetar()) { metars.push_back(metar); } else { invalidLines++; }