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

Timestamp:

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

Author:

stuerze

Message:

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

File:

• trunk/BNC/src/bnccore.cpp (modified) (7 diffs)

trunk/BNC/src/bnccore.cpp

@@ -71 +71 @@
   _logFile     = 0;
   _logStream   = 0;
+  _logFileStructured  = 0;
+  _logFormatStructured = t_logRecord::json;
   _rawFile     = 0;
   _caster      = 0;
@@ -103 +105 @@
   qRegisterMetaType< QVector<double> >      ("QVector<double>");
   qRegisterMetaType<bncTime>                ("bncTime");
+  qRegisterMetaType<t_logRecord>            ("t_logRecord");
   qRegisterMetaType<t_ephGPS>               ("t_ephGPS");
   qRegisterMetaType<t_ephGlo>               ("t_ephGlo");
@@ -122 +125 @@
   delete _logStream; _logStream = 0;
   delete _logFile;   _logFile   = 0;
+  delete _logFileStructured; _logFileStructured = 0;
   qDeleteAll(_ephFiles);
   delete _serverEph;
@@ -144 +148 @@
     return;
   }
+  slotLogRecord(t_logRecord::fromMessage(msg), showOnScreen);
+}
+
+// Write a Program Message with structured fields (structured logfile);
+// the classic logfile and the screen get the text rec._msg
+////////////////////////////////////////////////////////////////////////////
+void t_bncCore::slotLogRecord(t_logRecord rec, bool showOnScreen) {
+  if (rec._msg.isEmpty()) {
+    return;
+  }
   QMutexLocker locker(&_mutexMessage);
 
-  messagePrivate(msg);
-  emit newMessage(msg, showOnScreen);
+  messagePrivate(rec);
+  emit newMessage(rec._msg, showOnScreen);
 }
 
 // Write a Program Message (private, no lock)
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::messagePrivate(const QByteArray& msg) {
-
-  // First time resolve the log file name
-  // ------------------------------------
-  QDate currDate = currentDateAndTimeGPS().date();
+void t_bncCore::messagePrivate(const t_logRecord& rec) {
+
+  // First time resolve the log file names
+  // -------------------------------------
+  QDateTime currDateTime = currentDateAndTimeGPS();
+  QDate currDate = currDateTime.date();
   if (_logFileFlag == 0 || _fileDate != currDate) {
     delete _logStream; _logStream = 0;
     delete _logFile;   _logFile   = 0;
+    delete _logFileStructured; _logFileStructured = 0;
     _logFileFlag = 1;
+    _fileDate = currDate;
     bncSettings settings;
+    bool append = (Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked);
     QString logFileName = settings.value("logFile").toString();
     if ( !logFileName.isEmpty() ) {
@@ -167 +185 @@
       _logFile = new QFile(logFileName + "_" +
                           currDate.toString("yyMMdd").toLatin1().data());
-      _fileDate = currDate;
-      if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked) {
+      if (append) {
         _logFile->open(QIODevice::WriteOnly | QIODevice::Append);
       }
@@ -177 +194 @@
       _logStream->setDevice(_logFile);
     }
+    QString structName = settings.value("logFileStructured").toString();
+    if ( !structName.isEmpty() ) {
+      expandEnvVar(structName);
+      _logFormatStructured = t_logRecord::formatFromString(
+                               settings.value("logFormatStructured").toString());
+      _logFileStructured = new QFile(structName + "_" + currDate.toString("yyMMdd"));
+      if (!_logFileStructured->open(append ? (QIODevice::WriteOnly | QIODevice::Append)
+                                           : QIODevice::WriteOnly)) {
+        delete _logFileStructured; _logFileStructured = 0;
+      }
+    }
   }
 
   if (_logStream) {
-    QByteArray msgLocal = msg;
-    if (msg.indexOf('\n') == 0) {
+    QByteArray msgLocal = rec._msg;
+    if (rec._msg.indexOf('\n') == 0) {
       *_logStream << "\r\n";
-      msgLocal = msg.mid(1);
-    }
-    *_logStream << currentDateAndTimeGPS().toString("yy-MM-dd hh:mm:ss ").toLatin1().data();
+      msgLocal = rec._msg.mid(1);
+    }
+    *_logStream << currDateTime.toString("yy-MM-dd hh:mm:ss ").toLatin1().data();
     *_logStream << msgLocal.data() << "\r\n";
     _logStream->flush();
     _logFile->flush();
+  }
+
+  if (_logFileStructured) {
+    _logFileStructured->write(rec.encode(_logFormatStructured, currDateTime) + "\n");
+    _logFileStructured->flush();
   }
 }
@@ -199 +232 @@
 #ifdef BNC_DEBUG_BCE
   if (eph->checkState() == t_eph::unhealthy) {
-    messagePrivate(QString("%1: UNHEALTHY %2:%3")
+    messagePrivate(t_logRecord::fromMessage(QString("%1: UNHEALTHY %2:%3")
                    .arg(eph->receptStaID())
                    .arg(eph->typeStr(eph->type(), eph->prn(), 99.0))
-                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1());
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1()));
   }
   if (eph->checkState() == t_eph::bad) {
-    messagePrivate(QString("%1: WRONG %2:%3")
+    messagePrivate(t_logRecord::fromMessage(QString("%1: WRONG %2:%3")
                    .arg(eph->receptStaID())
                    .arg(eph->typeStr(eph->type(), eph->prn(), 99.0))
-                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1());
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1()));
   }
   if (eph->checkState() == t_eph::outdated) {
-    messagePrivate(QString("%1: OUTDATED %2:%3")
+    messagePrivate(t_logRecord::fromMessage(QString("%1: OUTDATED %2:%3")
                    .arg(eph->receptStaID())
                    .arg(eph->typeStr(eph->type(), eph->prn(), 99.0))
-                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1());
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1()));
   }
 #endif