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

Timestamp:

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

Author:

stuerze

Message:

Structured logging improved

File:

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

trunk/BNC/src/bnccore.cpp

@@ -73 +73 @@
   _logFileStructured  = 0;
   _logFormatStructured = t_logRecord::json;
+  _logLevelStructured  = t_logRecord::debug;
   _rawFile     = 0;
   _caster      = 0;
@@ -149 +150 @@
   }
   slotLogRecord(t_logRecord::fromMessage(msg), showOnScreen);
+}
+
+// Write a Program Message of a component with an explicit level
+////////////////////////////////////////////////////////////////////////////
+void t_bncCore::message(const QByteArray& msg, bool showOnScreen, const QByteArray& component,
+                        t_logRecord::e_level level) {
+  if (msg.isEmpty()) {
+    return;
+  }
+  slotLogRecord(t_logRecord::message(level, msg, component), showOnScreen);
+}
+
+// Write a Program Message of a component
+////////////////////////////////////////////////////////////////////////////
+void t_bncCore::message(const QByteArray& msg, bool showOnScreen, const QByteArray& component) {
+  if (msg.isEmpty()) {
+    return;
+  }
+  slotLogRecord(t_logRecord::fromMessage(msg, component), showOnScreen);
 }
 
@@ -199 +219 @@
       _logFormatStructured = t_logRecord::formatFromString(
                                settings.value("logFormatStructured").toString());
+      _logLevelStructured  = t_logRecord::levelFromString(
+                               settings.value("logLevelStructured").toString());
       _logFileStructured = new QFile(structName + "_" + currDate.toString("yyMMdd"));
       if (!_logFileStructured->open(append ? (QIODevice::WriteOnly | QIODevice::Append)
@@ -219 +241 @@
   }
 
-  if (_logFileStructured) {
+  if (_logFileStructured && rec._level >= _logLevelStructured) {
     _logFileStructured->write(rec.encode(_logFormatStructured, currDateTime) + "\n");
     _logFileStructured->flush();
@@ -232 +254 @@
 #ifdef BNC_DEBUG_BCE
   if (eph->checkState() == t_eph::unhealthy) {
-    messagePrivate(t_logRecord::fromMessage(QString("%1: UNHEALTHY %2:%3")
+    messagePrivate(t_logRecord::debugMessage("bce", QString("%1: UNHEALTHY %2:%3")
                    .arg(eph->receptStaID())
                    .arg(eph->typeStr(eph->type(), eph->prn(), 99.0))
@@ -238 +260 @@
   }
   if (eph->checkState() == t_eph::bad) {
-    messagePrivate(t_logRecord::fromMessage(QString("%1: WRONG %2:%3")
+    messagePrivate(t_logRecord::debugMessage("bce", QString("%1: WRONG %2:%3")
                    .arg(eph->receptStaID())
                    .arg(eph->typeStr(eph->type(), eph->prn(), 99.0))
@@ -244 +266 @@
   }
   if (eph->checkState() == t_eph::outdated) {
-    messagePrivate(t_logRecord::fromMessage(QString("%1: OUTDATED %2:%3")
+    messagePrivate(t_logRecord::debugMessage("bce", QString("%1: OUTDATED %2:%3")
                    .arg(eph->receptStaID())
                    .arg(eph->typeStr(eph->type(), eph->prn(), 99.0))
@@ -633 +655 @@
                       + QByteArray::number(_portEph) + ": "
                       + _serverEph->errorString();
-      slotMessage(message.toLatin1(), true);
+      slotLogRecord(t_logRecord::message(t_logRecord::error, message.toLatin1(), "bnc"), true);
     }
     connect(_serverEph, SIGNAL(newConnection()), this, SLOT(slotNewConnectionEph()));
@@ -653 +675 @@
                       + QByteArray::number(_portCorr) + ": "
                       + _serverCorr->errorString();
-      slotMessage(message.toLatin1(), true);
+      slotLogRecord(t_logRecord::message(t_logRecord::error, message.toLatin1(), "bnc"), true);
     }
     connect(_serverCorr, SIGNAL(newConnection()), this, SLOT(slotNewConnectionCorr()));