Changeset 11179 in ntrip for trunk/BNC/src/bncgetthread.cpp

Timestamp:

Nov 6, 2026, 4:05:20 PM (6 hours ago)

Author:

stuerze

Message:

structuered logging is added and bug is fixed in SP3 file writing

File:

• trunk/BNC/src/bncgetthread.cpp (modified) (6 diffs)

trunk/BNC/src/bncgetthread.cpp

@@ -131 +131 @@
   connect(this, SIGNAL(newMessage(QByteArray,bool)),
   BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
+  connect(this, SIGNAL(newLogRecord(t_logRecord,bool)),
+  BNC_CORE, SLOT(slotLogRecord(t_logRecord,bool)));
+  t_logRecord::registerStation(_staID);
 
   _isToBeDeleted = false;
@@ -330 +333 @@
       _format.indexOf("RTCM2")  != -1 ||
       _format.indexOf("RTCM 2") != -1) {
-    emit(newMessage(_staID + ": Get data in RTCM 2.x format", true));
+    emitFormat(": Get data in RTCM 2.x format", "RTCM2");
     _decoder = new RTCM2Decoder(_staID.data());
   } else if (_format.indexOf("RTCM_3") != -1 ||
       _format.indexOf("RTCM3")  != -1 ||
       _format.indexOf("RTCM 3") != -1) {
-    emit(newMessage(_staID + ": Get data in RTCM 3.x format", true));
+    emitFormat(": Get data in RTCM 3.x format", "RTCM3");
     RTCM3Decoder* newDecoder = new RTCM3Decoder(_staID, _rawFile);
     _decoder = newDecoder;
@@ -341 +344 @@
         this, SIGNAL(newMessage(QByteArray,bool)));
   } else if (_format == "ZERO") {
-    emit(newMessage(_staID + ": Forward data in original format", true));
+    emitFormat(": Forward data in original format", "ZERO");
     _decoder = new bncZeroDecoder(_staID, false);
   }
   else if (_format == "ZERO2FILE") {
-    emit(newMessage(_staID + ": Get data in original format and store it", true));
+    emitFormat(": Get data in original format and store it", "ZERO2FILE");
     _decoder = new bncZeroDecoder(_staID, true);
   }
   else if (_format.indexOf("RTNET") != -1) {
-    emit(newMessage(_staID + ": Get data in RTNet format", true));
+    emitFormat(": Get data in RTNet format", "RTNET");
     _decoder = new bncRtnetDecoder();
   } else {
@@ -481 +484 @@
         _format = _rawFile->format();
         _staID = _rawFile->staID();
+        t_logRecord::registerStation(_staID);
 
         QCoreApplication::processEvents();
@@ -508 +512 @@
           _latencyChecker->checkReconnect();
         }
-        emit(newMessage(_staID + ": Data timeout, reconnecting", true));
+        emit newLogRecord(t_logRecord(t_logRecord::warning, "stream", "stream_timeout", _staID,
+                                      _staID + ": Data timeout, reconnecting"), true);
         msleep(10000); //sleep 10 sec, G. Weber
         continue;
@@ -1143 +1148 @@
   }
 }
+
+// Message on the data format of the stream
+////////////////////////////////////////////////////////////////////////////
+void bncGetThread::emitFormat(const char* text, const char* decoder) {
+  t_logRecord rec(t_logRecord::info, "stream", "stream_format", _staID, _staID + text);
+  rec.add("decoder", QByteArray(decoder))
+     .add("format", _format);
+  emit newLogRecord(rec, true);
+}