Utility function to directly log warning when network not accessible

src/blackcore/db/databasereader.cpp

@@ -179,11 +179,7 @@ namespace BlackCore
 
             // ps_read is implemented in the derived classes
             if (entities == CEntityFlags::NoEntity) { return; }
-            if (!this->isNetworkAccessible())
+            if (!this->isNetworkAccessible(QString("No network, will not read %1").arg(CEntityFlags::flagToString(entities)))) { return; }
-            {
-                CLogMessage(this).warning("No network, will not read %1") << CEntityFlags::flagToString(entities);
-                return;
-            }
 
             const bool s = QMetaObject::invokeMethod(this, "ps_read",
                            Q_ARG(BlackMisc::Network::CEntityFlags::Entity, entities),
@@ -355,11 +351,7 @@ namespace BlackCore
 
         bool CDatabaseReader::requestHeadersOfSharedFiles(CEntityFlags::Entity entities)
         {
-            if (!this->isNetworkAccessible())
+            if (!this->isNetworkAccessible(QString("No network, will not read shared file headers for %1").arg(CEntityFlags::flagToString(entities)))) { return false; }
-            {
-                CLogMessage(this).warning("No network, will not read shared file headers for %1") << CEntityFlags::flagToString(entities);
-                return false;
-            }
 
             CEntityFlags::Entity allEntities(this->maskBySupportedEntities(entities));
             CEntityFlags::Entity currentEntity = CEntityFlags::iterateDbEntities(allEntities);

src/blackcore/threadedreader.cpp

@@ -11,6 +11,7 @@
 #include "blackcore/application.h"
 #include "blackmisc/network/networkutils.h"
 #include "blackmisc/threadutils.h"
+#include "blackmisc/logmessage.h"
 
 #include <QCoreApplication>
 #include <QMetaObject>
@@ -66,9 +67,14 @@ namespace BlackCore
         return delta <= timeLastMs;
     }
 
-    bool CThreadedReader::isNetworkAccessible() const
+    bool CThreadedReader::isNetworkAccessible(const QString &logWarningMessage) const
     {
-        return sApp->isNetworkAccessible();
+        const bool a = sApp->isNetworkAccessible();
+        if (!a && !logWarningMessage.isEmpty())
+        {
+            CLogMessage(this).warning(logWarningMessage);
+        }
+        return a;
     }
 
     void CThreadedReader::startReader()

src/blackcore/threadedreader.h

@@ -53,7 +53,8 @@ namespace BlackCore
         bool updatedWithinLastMs(qint64 timeLastMs);
 
         //! Network accessible?
-        bool isNetworkAccessible() const;
+        //! \param logWarningMessage optional warning if not accessible
+        bool isNetworkAccessible(const QString &logWarningMessage = {}) const;
 
         //! Is marked as read failed
         //! \threadsafe

src/blackcore/vatsim/vatsimbookingreader.cpp

@@ -64,11 +64,7 @@ namespace BlackCore
         {
             this->threadAssertCheck();
             if (!this->doWorkCheck()) { return; }
-            if (!this->isNetworkAccessible())
+            if (!this->isNetworkAccessible("No network, cannot read VATSIM bookings")) { return; }
-            {
-                CLogMessage(this).warning("No network, cannot read VATSIM bookings");
-                return;
-            }
 
             Q_ASSERT_X(sApp, Q_FUNC_INFO, "No application");
             const QUrl url(sApp->getGlobalSetup().getVatsimBookingsUrl());

src/blackcore/vatsim/vatsimdatafilereader.cpp

@@ -183,11 +183,7 @@ namespace BlackCore
         {
             this->threadAssertCheck();
             if (!this->doWorkCheck()) { return; }
-            if (!this->isNetworkAccessible())
+            if (!this->isNetworkAccessible("No network, cannot read VATSIM data file")) { return; }
-            {
-                CLogMessage(this).warning("No network, cannot read VATSIM data file");
-                return;
-            }
 
             // round robin for load balancing
             // remark: Don't use QThread to run network operations in the background

src/blackcore/vatsim/vatsimmetarreader.cpp

@@ -76,11 +76,7 @@ namespace BlackCore
         {
             this->threadAssertCheck();
             if (!this->doWorkCheck()) { return; }
-            if (!this->isNetworkAccessible())
+            if (!this->isNetworkAccessible("No network, cannot read METARs")) { return; }
-            {
-                CLogMessage(this).warning("No network, cannot read METARs");
-                return;
-            }
 
             CFailoverUrlList urls(sApp->getVatsimMetarUrls());
             const CUrl url(urls.obtainNextWorkingUrl(true));

src/blackcore/vatsim/vatsimstatusfilereader.cpp

@@ -66,11 +66,7 @@ namespace BlackCore
         {
             this->threadAssertCheck();
             if (!this->doWorkCheck()) { return; }
-            if (!this->isNetworkAccessible())
+            if (!this->isNetworkAccessible("No network, cannot read VATSIM status file")) { return; }
-            {
-                CLogMessage(this).warning("No network, cannot read VATSIM status file");
-                return;
-            }
 
             Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing application");
             CFailoverUrlList urls(sApp->getGlobalSetup().getVatsimStatusFileUrls());