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

[FSD] Adjusted logging of unknown FSD types, queries ....

Browse Source 
* made those simple log. messages
* only log. those once

See https://discordapp.com/channels/539048679160676382/539925070550794240/694927156748222475
This commit is contained in:
Klaus Basan
2020-04-01 19:06:56 +02:00
committed by Mat Sutcliffe
parent 299859646a
commit 81049cd835
1 changed files with 63 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/blackcore/fsd/serializer.cpp
View File

@@ -8,8 +8,14 @@
#include "serializer.h"
#include "blackmisc/verify.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/logcategory.h"
#include "blackconfig/buildconfig.h"
using namespace BlackConfig;
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
namespace BlackCore
{
@@ -17,6 +23,29 @@ namespace BlackCore
{
//! private @{
namespace Private
{
// log each issue only once
static QStringList s_invalidAtcRatings;
static QStringList s_invalidPilotRatings;
static QStringList s_invalidSimType;
static QStringList s_invalidFacilityType;
static QStringList s_invalidQueryType;
//! Log unknown message types or ratings
void logUnknownType(const QString &message)
{
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
// developers should record these types and EXPLICITLY exclude them
const QByteArray msg = message.toLatin1();
BLACK_VERIFY_X(false, Q_FUNC_INFO, msg);
}
CLogMessage(CLogCategory::fsd()).info(u"%1. Please report this to the DEVELOPERS!") << message;
}
}
template<>
QString toQString(const AtcRating &value)
{
@@ -62,8 +91,12 @@ namespace BlackCore
else if (str == "12") return AtcRating::Administrator;
// we should NOT get here
const QByteArray msg = QStringLiteral("FSD unknown ATC rating '%1'").arg(str).toLatin1();
BLACK_AUDIT_X(false, Q_FUNC_INFO, msg.constData());
if (!Private::s_invalidAtcRatings.contains(str))
{
Private::s_invalidAtcRatings.push_back(str);
const QString msg = QStringLiteral("FSD unknown ATC rating '%1'").arg(str);
Private::logUnknownType(msg);
}
return AtcRating::Unknown;
}
@@ -99,8 +132,12 @@ namespace BlackCore
else if (str == "5") return PilotRating::Supervisor;
// we should NOT get here
const QByteArray msg = QStringLiteral("FSD Unknown Pilot rating '%1'").arg(str).toLatin1();
BLACK_AUDIT_X(false, Q_FUNC_INFO, msg.constData());
if (!Private::s_invalidPilotRatings.contains(str))
{
Private::s_invalidPilotRatings.push_back(str);
const QString msg = QStringLiteral("FSD Unknown Pilot rating '%1'").arg(str);
Private::logUnknownType(msg);
}
return PilotRating::Unknown;
}
@@ -166,16 +203,18 @@ namespace BlackCore
else if (str == "30") return SimType::P3Dv4;
// we should NOT get here
const QByteArray msg = QStringLiteral("FSD unknown SimType '%1'").arg(str).toLatin1();
BLACK_AUDIT_X(false, Q_FUNC_INFO, msg.constData());
if (!Private::s_invalidSimType.contains(str))
{
Private::s_invalidSimType.push_back(str);
const QString msg = QStringLiteral("FSD unknown SimType '%1'").arg(str);
Private::logUnknownType(msg);
}
return SimType::Unknown;
}
template<>
QString toQString(const BlackMisc::Network::CFacilityType &value)
QString toQString(const CFacilityType &value)
{
using namespace BlackMisc::Network;
switch (value.getFacilityType())
{
case CFacilityType::OBS: return "0";
@@ -193,10 +232,8 @@ namespace BlackCore
}
template<>
BlackMisc::Network::CFacilityType fromQString(const QString &str)
CFacilityType fromQString(const QString &str)
{
using namespace BlackMisc::Network;
// empty string intentionally ignored, also for UNIT test and 3rd parth networks
if (str.isEmpty()) return CFacilityType::Unknown;
@@ -209,8 +246,12 @@ namespace BlackCore
else if (str == "6") return CFacilityType::CTR;
// we should NOT get here
const QByteArray msg = QStringLiteral("FSD unknown CFacilityType '%1'").arg(str).toLatin1();
BLACK_AUDIT_X(false, Q_FUNC_INFO, msg.constData());
if (!Private::s_invalidFacilityType.contains(str))
{
Private::s_invalidFacilityType.push_back(str);
const QString msg = QStringLiteral("FSD unknown CFacilityType '%1'");
Private::logUnknownType(msg);
}
return CFacilityType::Unknown;
}
@@ -232,6 +273,7 @@ namespace BlackCore
case ClientQueryType::AircraftConfig: return "ACC";
case ClientQueryType::Unknown: return "Unknown query type";
}
Q_UNREACHABLE();
return "Unknown query type";
}
@@ -284,8 +326,13 @@ namespace BlackCore
if (str == "NEWINFO") return ClientQueryType::Unknown; // probably causing the Linux crash
// we should NOT get here
const QByteArray msg = QStringLiteral("FSD unknown ClientQueryType '%1'").arg(str).toLatin1();
BLACK_AUDIT_X(false, Q_FUNC_INFO, msg.constData());
if (!Private::s_invalidQueryType.contains(str))
{
Private::s_invalidQueryType.push_back(str);
const QString msg = QStringLiteral("FSD unknown ClientQueryType '%1'").arg(str);
Private::logUnknownType(msg);
}
return ClientQueryType::Unknown;
}