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

Reduced booking reader frequency as discussed with the site owner

Browse Source
This commit is contained in:
Klaus Basan
2019-05-31 01:35:05 +02:00
parent 500f0678b4
commit 2382be1c19
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackcore/vatsim/vatsimbookingreader.cpp
View File

@@ -47,7 +47,7 @@ namespace BlackCore
CThreadedReader(owner, "CVatsimBookingReader"), CThreadedReader(owner, "CVatsimBookingReader"),
CEcosystemAware(CEcosystemAware::providerIfPossible(owner)) CEcosystemAware(CEcosystemAware::providerIfPossible(owner))
{ {
settingsChanged(); this->settingsChanged();
} }
void CVatsimBookingReader::readInBackgroundThread() void CVatsimBookingReader::readInBackgroundThread()
@@ -93,6 +93,7 @@ namespace BlackCore
return; // stop, terminate straight away, ending thread return; // stop, terminate straight away, ending thread
} }
const CReaderSettings settings = m_settings.get();
this->logNetworkReplyReceived(nwReplyPtr); this->logNetworkReplyReceived(nwReplyPtr);
if (nwReply->error() == QNetworkReply::NoError) if (nwReply->error() == QNetworkReply::NoError)
{ {
@@ -191,13 +192,15 @@ namespace BlackCore
} }
// time checks // time checks
const QDateTime now = QDateTime::currentDateTimeUtc(); const QDateTime now = QDateTime::currentDateTimeUtc();
if (now.msecsTo(bookedStation.getBookedUntilUtc()) < (1000 * 60 * 15)) { continue; } // until n mins in past if (now.msecsTo(bookedStation.getBookedUntilUtc()) < (1000 * 60 * 15)) { continue; } // until n mins in past
if (now.msecsTo(bookedStation.getBookedFromUtc()) > (1000 * 60 * 60 * 24)) { continue; } // to far in the future, n hours if (now.msecsTo(bookedStation.getBookedFromUtc()) > (1000 * 60 * 60 * 24)) { continue; } // to far in the future, n hours
bookedStation.setController(user); bookedStation.setController(user);
bookedStations.push_back(bookedStation); bookedStations.push_back(bookedStation);
} }
m_failures = 0; m_failures = 0;
this->setUpdateTimestamp(updateTimestamp); // thread safe update this->setUpdateTimestamp(updateTimestamp); // thread safe update
this->setInitialAndPeriodicTime(settings.getInitialTime().toMs(), 3 * settings.getPeriodicTime().toMs()); // slow down, we have some bookings now
emit this->atcBookingsRead(bookedStations); emit this->atcBookingsRead(bookedStations);
emit this->dataRead(CEntityFlags::BookingEntity, CEntityFlags::ReadFinished, bookedStations.size()); emit this->dataRead(CEntityFlags::BookingEntity, CEntityFlags::ReadFinished, bookedStations.size());
} // node } // node
@@ -211,8 +214,7 @@ namespace BlackCore
if (m_failures > 3) if (m_failures > 3)
{ {
// slow updates from now on // slow updates from now on
const CReaderSettings s = m_settings.get(); this->setInitialAndPeriodicTime(settings.getInitialTime().toMs(), 10 * settings.getPeriodicTime().toMs()); // massively slow down
this->setInitialAndPeriodicTime(s.getInitialTime().toMs(), 10 * s.getPeriodicTime().toMs());
CLogMessage(this).warning(u"Too many booking reader failures %1, slower updates") << m_failures; CLogMessage(this).warning(u"Too many booking reader failures %1, slower updates") << m_failures;
} }
emit this->dataRead(CEntityFlags::BookingEntity, CEntityFlags::ReadFailed, 0); emit this->dataRead(CEntityFlags::BookingEntity, CEntityFlags::ReadFailed, 0);

2
src/blackcore/vatsim/vatsimsettings.h
View File

@@ -95,7 +95,7 @@ namespace BlackCore
//! \copydoc BlackMisc::TSettingTrait::defaultValue //! \copydoc BlackMisc::TSettingTrait::defaultValue
static const BlackCore::Vatsim::CReaderSettings &defaultValue() static const BlackCore::Vatsim::CReaderSettings &defaultValue()
{ {
static const BlackCore::Vatsim::CReaderSettings reader {{30.0, BlackMisc::PhysicalQuantities::CTimeUnit::s()}, {120.0, BlackMisc::PhysicalQuantities::CTimeUnit::s()}}; static const BlackCore::Vatsim::CReaderSettings reader {{30.0, BlackMisc::PhysicalQuantities::CTimeUnit::s()}, {600.0, BlackMisc::PhysicalQuantities::CTimeUnit::s()}};
return reader; return reader;
} }
}; };