refs #857, check if network is accessible in readers

* new read state "skipped"
* renamed to "isNetworkConnectedAndAccessible"
* checking before reading, which would only fail if network is not accessible
This commit is contained in:
Klaus Basan
2017-01-12 18:07:35 +01:00
committed by Mathew Sutcliffe
parent 04e980a6ae
commit 1ced7f3c0b
14 changed files with 49 additions and 21 deletions

View File

@@ -67,7 +67,7 @@ namespace BlackCore
void CVatsimBookingReader::ps_read()
{
if (!this->isNetworkAvailable())
if (!this->isNetworkConnectedAndAccessible())
{
CLogMessage(this).warning("No network, cannot read VATSIM bookings");
return;

View File

@@ -185,7 +185,7 @@ namespace BlackCore
void CVatsimDataFileReader::ps_read()
{
if (!this->isNetworkAvailable())
if (!this->isNetworkConnectedAndAccessible())
{
CLogMessage(this).warning("No network, cannot read VATSIM data file");
return;

View File

@@ -80,7 +80,7 @@ namespace BlackCore
void CVatsimMetarReader::readMetars()
{
if (this->isAbandoned()) { return; }
if (!this->isNetworkAvailable())
if (!this->isNetworkConnectedAndAccessible())
{
CLogMessage(this).warning("No network, cannot read METARs");
return;

View File

@@ -71,6 +71,7 @@ namespace BlackCore
void CVatsimStatusFileReader::ps_read()
{
this->threadAssertCheck();
if (!this->isNetworkConnectedAndAccessible()) { return; }
Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing application");
CFailoverUrlList urls(sApp->getGlobalSetup().getVatsimStatusFileUrls());