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

Timestamp:

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

Author:

stuerze

Message:

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

File:

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

trunk/BNC/src/latencychecker.cpp

@@ -62 +62 @@
   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)));
 
   bncSettings settings;
@@ -177 +179 @@
       _begDateOut = _endDateTimeOut.toUTC().date().toString("yy-MM-dd");
       _begTimeOut = _endDateTimeOut.toUTC().time().toString("hh:mm:ss");
-      emit(newMessage((_staID + ": Failure threshold exceeded, outage since "
-                    + _begDateOut + " " + _begTimeOut + " UTC").toLatin1(), true));
+      _outageSince = _endDateTimeOut.toUTC();
+      t_logRecord rec(t_logRecord::warning, "stream", "stream_outage_begin", _staID,
+                      (_staID + ": Failure threshold exceeded, outage since "
+                       + _begDateOut + " " + _begTimeOut + " UTC").toLatin1());
+      rec.addTime("since", _outageSince);
+      emit newLogRecord(rec, true);
       callScript(("Begin_Outage "
                     + _begDateOut + " " + _begTimeOut + " UTC").toLatin1());
@@ -256 +262 @@
           _begDateCorr = _endDateTimeCorr.toUTC().date().toString("yy-MM-dd");
           _begTimeCorr = _endDateTimeCorr.toUTC().time().toString("hh:mm:ss");
-          emit(newMessage((_staID + ": Failure threshold exceeded, corrupted since "
-                    + _begDateCorr + " " + _begTimeCorr + " UTC").toLatin1(), true));
+          _corruptSince = _endDateTimeCorr.toUTC();
+          t_logRecord rec(t_logRecord::warning, "stream", "stream_corrupted_begin", _staID,
+                          (_staID + ": Failure threshold exceeded, corrupted since "
+                           + _begDateCorr + " " + _begTimeCorr + " UTC").toLatin1());
+          rec.addTime("since", _corruptSince);
+          emit newLogRecord(rec, true);
           callScript(("Begin_Corrupted "
                     + _begDateCorr + " " + _begTimeCorr + " UTC").toLatin1());
@@ -276 +286 @@
             _endDateCorr = _begDateTimeCorr.toUTC().date().toString("yy-MM-dd");
             _endTimeCorr = _begDateTimeCorr.toUTC().time().toString("hh:mm:ss");
-            emit(newMessage((_staID + ": Recovery threshold exceeded, corruption ended "
-                        + _endDateCorr + " " + _endTimeCorr + " UTC").toLatin1(), true));
+            t_logRecord rec(t_logRecord::info, "stream", "stream_corrupted_end", _staID,
+                            (_staID + ": Recovery threshold exceeded, corruption ended "
+                             + _endDateCorr + " " + _endTimeCorr + " UTC").toLatin1());
+            rec.addTime("ended", _begDateTimeCorr);
+            if (_corruptSince.isValid()) {
+              rec.addTime("since", _corruptSince);
+            }
+            emit newLogRecord(rec, true);
             callScript(("End_Corrupted "
                         + _endDateCorr + " " + _endTimeCorr + " UTC Begin was "
@@ -304 +320 @@
       _endDateOut = _begDateTimeOut.toUTC().date().toString("yy-MM-dd");
       _endTimeOut = _begDateTimeOut.toUTC().time().toString("hh:mm:ss");
-      emit(newMessage((_staID + ": Recovery threshold exceeded, outage ended "
-                    + _endDateOut + " " + _endTimeOut + " UTC").toLatin1(), true));
+      t_logRecord rec(t_logRecord::info, "stream", "stream_outage_end", _staID,
+                      (_staID + ": Recovery threshold exceeded, outage ended "
+                       + _endDateOut + " " + _endTimeOut + " UTC").toLatin1());
+      rec.addTime("ended", _begDateTimeOut);
+      if (_outageSince.isValid()) {
+        rec.addTime("since", _outageSince);
+      }
+      emit newLogRecord(rec, true);
       callScript(("End_Outage "
                     + _endDateOut + " " + _endTimeOut + " UTC Begin was "
@@ -331 +353 @@
         if (l._newSec % (_miscIntr * 10) < l._oldSec % (_miscIntr * 10)) {
           if (l._numLat > 0) {
-            if (l._meanDiff > 0.0) {
-              if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) {
-                emit( newMessage(QString("%1 %2: Mean latency %3 sec, min %4, max %5, rms %6, %7 epochs, %8 gaps")
-                  .arg(_staID.data())
-                  .arg(l._type.data())
-                  .arg(int(l._sumLat/l._numLat*100)/100., 4, 'f', 2)
-                  .arg(int(l._minLat*100)/100., 4, 'f', 2)
-                  .arg(int(l._maxLat*100)/100., 4, 'f', 2)
-                  .arg(int((sqrt(l._sumLatQ / l._numLat))*100)/100., 4, 'f', 2)
-                  .arg(l._numLat)
-                  .arg(l._numGaps)
-                  .toLatin1(), true) );
-              }
-            } else {
-              if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) {
-                emit( newMessage(QString("%1 %2: Mean latency %3 sec, min %4, max %5, rms %6, %7 epochs")
-                  .arg(_staID.data())
-                  .arg(l._type.data())
-                  .arg(int(l._sumLat/l._numLat*100)/100., 4, 'f', 2)
-                  .arg(int(l._minLat*100)/100., 4, 'f', 2)
-                  .arg(int(l._maxLat*100)/100., 4, 'f', 2)
-                  .arg(int((sqrt(l._sumLatQ / l._numLat))*100)/100., 4, 'f', 2)
-                  .arg(l._numLat)
-                  .toLatin1(), true) );
-              }
+            if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) {
+              emitLatency(l);
             }
             l._meanDiff  = l._diffSec / l._numLat;
@@ -456 +455 @@
       if (int(l._newSec) % _miscIntr < int(l._oldSec) % _miscIntr) {
         if (l._numLat>0) {
-          QString late;
-          if (l._meanDiff>0.) {
-            late = QString(" %1: Mean latency %2 sec, min %3, max %4, rms %5, %6 epochs, %7 gaps")
-            .arg(l._type.data())
-            .arg(int(l._sumLat/l._numLat*100)/100., 4, 'f', 2)
-            .arg(int(l._minLat*100)/100., 4, 'f', 2)
-            .arg(int(l._maxLat*100)/100., 4, 'f', 2)
-            .arg(int((sqrt(l._sumLatQ / l._numLat))*100)/100., 4, 'f', 2)
-            .arg(l._numLat)
-            .arg(l._numGaps);
-            if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) {
-              emit(newMessage(QString(_staID + late ).toLatin1(), true) );
-            }
-          }
-          else {
-            late = QString(" %1: Mean latency %2 sec, min %3, max %4, rms %5, %6 epochs")
-            .arg(l._type.data())
-            .arg(int(l._sumLat/l._numLat*100)/100., 4, 'f', 2)
-            .arg(int(l._minLat*100)/100., 4, 'f', 2)
-            .arg(int(l._maxLat*100)/100., 4, 'f', 2)
-            .arg(int((sqrt(l._sumLatQ / l._numLat))*100)/100., 4, 'f', 2)
-            .arg(l._numLat);
-            if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) {
-            emit(newMessage(QString(_staID + late ).toLatin1(), true) );
-            }
+          if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) {
+            emitLatency(l);
           }
         }
@@ -568 +544 @@
   }
 }
+
+// Mean latency message of one interval (classic text unchanged)
+//////////////////////////////////////////////////////////////////////////////
+void latencyChecker::emitLatency(const t_latency& l) {
+  double mean = int(l._sumLat/l._numLat*100)/100.;
+  double min  = int(l._minLat*100)/100.;
+  double max  = int(l._maxLat*100)/100.;
+  double rms  = int((sqrt(l._sumLatQ / l._numLat))*100)/100.;
+  bool   gaps = (l._meanDiff > 0.0);
+  QString text = QString("%1 %2: Mean latency %3 sec, min %4, max %5, rms %6, %7 epochs")
+    .arg(_staID.data())
+    .arg(l._type.data())
+    .arg(mean, 4, 'f', 2)
+    .arg(min, 4, 'f', 2)
+    .arg(max, 4, 'f', 2)
+    .arg(rms, 4, 'f', 2)
+    .arg(l._numLat);
+  if (gaps) {
+    text += QString(", %1 gaps").arg(l._numGaps);
+  }
+  t_logRecord rec(t_logRecord::info, "stream", "stream_latency", _staID, text.toLatin1());
+  rec.add("type", l._type)
+     .add("mean", mean, 2)
+     .add("min", min, 2)
+     .add("max", max, 2)
+     .add("rms", rms, 2)
+     .add("epochs", int(l._numLat));
+  if (gaps) {
+    rec.add("gaps", int(l._numGaps));
+  }
+  emit newLogRecord(rec, true);
+}