Changeset 11185 in ntrip for trunk/BNC/src/upload/bncuploadcaster.cpp

Timestamp:

Nov 9, 2026, 12:15:48 PM (12 hours ago)

Author:

stuerze

Message:

Structured logging improved

File:

• trunk/BNC/src/upload/bncuploadcaster.cpp (modified) (8 diffs)

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -63 +63 @@
   _isToBeDeleted = false;
 
-  connect(this, SIGNAL(newMessage(QByteArray,bool)), BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
+  BNC_CORE->connectMessages(this, "upload");
+  BNC_CORE->connectLogRecords(this, "upload");
 
   if (BNC_CORE->_uploadTableItems.find(_iRow) != BNC_CORE->_uploadTableItems.end()) {
@@ -95 +96 @@
       // no fallback to Ntrip Version 2: user name and password would be sent
       // unencrypted although an encrypted connection was configured
-      emit(newMessage(_mountpoint.toLatin1() + "@" + _casterOutHost.toLatin1() +
-          ": No SSL support, please install OpenSSL run-time libraries: no upload", true));
+      emit newLogRecord(t_logRecord::message(t_logRecord::error, _mountpoint.toLatin1() + "@" + _casterOutHost.toLatin1() +
+          ": No SSL support, please install OpenSSL run-time libraries: no upload"), true);
     } else {
       _secure = true;
@@ -137 +138 @@
 void bncUploadCaster::slotProxyAuthenticationRequired(const QNetworkProxy&,
     QAuthenticator*) {
-  emit newMessage("slotProxyAuthenticationRequired", true);
+  emit newLogRecord(t_logRecord::message(t_logRecord::warning, "slotProxyAuthenticationRequired"), true);
 }
 
@@ -171 +172 @@
       msg += " (ignored as configured)";
     }
-    emit(newMessage(_mountpoint.toLatin1() + "@" + _casterOutHost.toLatin1() + ": " + msg.toLatin1(), true));
+    emit newLogRecord(t_logRecord::message((_sslIgnoreErrors ? t_logRecord::warning : t_logRecord::error), _mountpoint.toLatin1() + "@" + _casterOutHost.toLatin1() + ": " + msg.toLatin1()), true);
   }
 }
@@ -274 +275 @@
   } else {
     if (_ntripVersion == "1") {
-      emit(newMessage("No proxy support in Ntrip Version 1 upload!", true));
+      emit newLogRecord(t_logRecord::message(t_logRecord::warning, "No proxy support in Ntrip Version 1 upload!"), true);
       delete _outSocket; _outSocket = 0;
       return;
@@ -299 +300 @@
       if (!statusOk(ans)) {
         int l = ans.indexOf("\r\n", 0);
-        emit(newMessage("Proxy: Connection broken for " + _mountpoint.toLatin1() + "@" +
-            _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1()  + ": "  + ans.left(l), true));
+        emit newLogRecord(t_logRecord::message(t_logRecord::warning, "Proxy: Connection broken for " + _mountpoint.toLatin1() + "@" +
+            _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1()  + ": "  + ans.left(l)), true);
         delete _outSocket; _outSocket = 0;
         return;
       } else {
-        emit(newMessage("Proxy: Connection established for " + _mountpoint.toLatin1()+ "@" +
-            _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() , true));
+        emit newLogRecord(t_logRecord::message(t_logRecord::info, "Proxy: Connection established for " + _mountpoint.toLatin1()+ "@" +
+            _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1()), true);
         _sOpenTrial = 0;
         _outSocket->setPeerVerifyName(_casterOutHost);
         _outSocket->startClientEncryption();
         if (!_outSocket->waitForEncrypted(timeOut)) {
-          emit(newMessage("Proxy/Caster: Encrypt timeout for " + _mountpoint.toLatin1() + "@"
+          emit newLogRecord(t_logRecord::message(t_logRecord::warning, "Proxy/Caster: Encrypt timeout for " + _mountpoint.toLatin1() + "@"
                           + _casterOutHost.toLatin1() + ":"
                           + QString("%1) ").arg(_casterOutPort).toLatin1()
-                          + _outSocket->errorString().toLatin1(), true));
+                          + _outSocket->errorString().toLatin1()), true);
           delete _outSocket; _outSocket = 0;
           return;
         } else {
-          emit(newMessage("Proxy: SSL handshake completed for " + _mountpoint.toLatin1() + "@" +
-              _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1(), true));
+          emit newLogRecord(t_logRecord::message(t_logRecord::info, "Proxy: SSL handshake completed for " + _mountpoint.toLatin1() + "@" +
+              _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1()), true);
         }
       }
@@ -347 +348 @@
     delete _outSocket; _outSocket = 0;
     int l = ans.indexOf("\r\n", 0);
-    emit(newMessage("Broadcaster: Connection broken for " + _mountpoint.toLatin1() + "@" +
+    emit newLogRecord(t_logRecord::message(t_logRecord::warning, "Broadcaster: Connection broken for " + _mountpoint.toLatin1() + "@" +
          _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
-         ": " + ans.left(l), true));
-  } else {
-    emit(newMessage("Broadcaster: Connection opened for " + _mountpoint.toLatin1() + "@" +
-        _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() , true));
+         ": " + ans.left(l)), true);
+  } else {
+    emit newLogRecord(t_logRecord::message(t_logRecord::info, "Broadcaster: Connection opened for " + _mountpoint.toLatin1() + "@" +
+        _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1()), true);
     _sOpenTrial = 0;
   }
@@ -364 +365 @@
     _outSocket->connectToHostEncrypted(outHost, outPort);
     if (!_outSocket->waitForEncrypted(timeOut)) {
-      emit(newMessage(
-           "Broadcaster: Connect timeout for " + _mountpoint.toLatin1() + "@"
+      emit newLogRecord(t_logRecord::message(t_logRecord::warning, "Broadcaster: Connect timeout for " + _mountpoint.toLatin1() + "@"
               + outHost.toLatin1() + ":"
               + QString("%1) ").arg(outPort).toLatin1()
-              + _outSocket->errorString().toLatin1(), true));
+              + _outSocket->errorString().toLatin1()), true);
       delete _outSocket; _outSocket = 0;
       return false;
     } else {
-      emit(newMessage("Broadcaster: SSL handshake completed for " + _mountpoint.toLatin1() + "@" +
-          _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1(), true));
+      emit newLogRecord(t_logRecord::message(t_logRecord::info, "Broadcaster: SSL handshake completed for " + _mountpoint.toLatin1() + "@" +
+          _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1()), true);
     }
   } else {
     _outSocket->connectToHost(outHost, outPort);
     if (!_outSocket->waitForConnected(timeOut)) {
-      emit(newMessage("Broadcaster: Connect timeout for " + _mountpoint.toLatin1() + "@"
+      emit newLogRecord(t_logRecord::message(t_logRecord::warning, "Broadcaster: Connect timeout for " + _mountpoint.toLatin1() + "@"
               + outHost.toLatin1() + ":"
               + QString("%1) ").arg(outPort).toLatin1()
-              + _outSocket->errorString().toLatin1(), true));
+              + _outSocket->errorString().toLatin1()), true);
       delete _outSocket; _outSocket = 0;
       return false;