flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 19:35:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Log info/warning about METAR URL

Browse Source
This commit is contained in:
Klaus Basan
2019-09-05 15:15:42 +02:00
parent 272677d719
commit ee91504cde
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -1175,6 +1175,7 @@ namespace BlackCore
CMetar CContextNetwork::getMetarForAirport(const CAirportIcaoCode &airportIcaoCode) const CMetar CContextNetwork::getMetarForAirport(const CAirportIcaoCode &airportIcaoCode) const
{ {
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << airportIcaoCode; } if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << airportIcaoCode; }
if (!sApp || !sApp->getWebDataServices()) { return {}; }
return sApp->getWebDataServices()->getMetarForAirport(airportIcaoCode); return sApp->getWebDataServices()->getMetarForAirport(airportIcaoCode);
} }

17
src/blackcore/vatsim/vatsimmetarreader.cpp
View File

@@ -29,6 +29,7 @@
#include <QtGlobal> #include <QtGlobal>
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
using namespace BlackMisc::Weather; using namespace BlackMisc::Weather;
using namespace BlackCore::Data; using namespace BlackCore::Data;
@@ -60,7 +61,7 @@ namespace BlackCore
return m_metars; return m_metars;
} }
CMetar CVatsimMetarReader::getMetarForAirport(const Aviation::CAirportIcaoCode &icao) const CMetar CVatsimMetarReader::getMetarForAirport(const CAirportIcaoCode &icao) const
{ {
QReadLocker l(&m_lock); QReadLocker l(&m_lock);
return m_metars.getMetarForAirport(icao); return m_metars.getMetarForAirport(icao);
@@ -108,14 +109,20 @@ namespace BlackCore
} }
this->logNetworkReplyReceived(nwReplyPtr); this->logNetworkReplyReceived(nwReplyPtr);
const QString metarUrl = nwReply->url().toString();
if (nwReply->error() == QNetworkReply::NoError) if (nwReply->error() == QNetworkReply::NoError)
{ {
QString metarData = nwReply->readAll(); QString metarData = nwReply->readAll();
nwReply->close(); // close asap nwReply->close(); // close asap
if (metarData.isEmpty()) // Quick check by hash
{
CLogMessage(this).warning(u"No METAR data from '%1', skipped") << metarUrl;
return;
}
if (!this->didContentChange(metarData)) // Quick check by hash if (!this->didContentChange(metarData)) // Quick check by hash
{ {
CLogMessage(this).info(u"METAR file has same content, skipped"); CLogMessage(this).info(u"METAR file from '%1' has same content, skipped") << metarUrl;
return; return;
} }
@@ -146,7 +153,7 @@ namespace BlackCore
else else
{ {
// network error // network error
CLogMessage(this).warning(u"Reading METARs failed '%1' for '%2'") << nwReply->errorString() << nwReply->url().toString(); CLogMessage(this).warning(u"Reading METARs failed '%1' for '%2'") << nwReply->errorString() << metarUrl;
nwReply->abort(); nwReply->abort();
emit this->dataRead(CEntityFlags::MetarEntity, CEntityFlags::ReadFailed, 0); emit this->dataRead(CEntityFlags::MetarEntity, CEntityFlags::ReadFailed, 0);
} }
@@ -154,8 +161,8 @@ namespace BlackCore
void CVatsimMetarReader::reloadSettings() void CVatsimMetarReader::reloadSettings()
{ {
CReaderSettings s = m_settings.get(); const CReaderSettings s = m_settings.get();
setInitialAndPeriodicTime(s.getInitialTime().toMs(), s.getPeriodicTime().toMs()); this->setInitialAndPeriodicTime(s.getInitialTime().toMs(), s.getPeriodicTime().toMs());
} }
} // ns } // ns
} // ns } // ns