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

Timestamp:

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

Author:

stuerze

Message:

Structured logging improved

File:

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

trunk/BNC/src/bnclog.cpp

@@ -24 +24 @@
 namespace {
 
-QMutex          stationMutex;
-QSet<QByteArray> stations;
+QMutex          streamMutex;
+QSet<QByteArray> streams;
 
 // text as UTF-8 (BNC's messages are Latin-1)
@@ -97 +97 @@
 // Envelope of a plain text message
 ////////////////////////////////////////////////////////////////////////////
-t_logRecord t_logRecord::fromMessage(const QByteArray& msg) {
-  t_logRecord rec(info, "bnc", "message", "", msg);
-
-  // station: first token of the text, if it is a known station name
+t_logRecord t_logRecord::fromMessage(const QByteArray& msg, const QByteArray& component) {
+  t_logRecord rec(info, component, "message", "", msg);
+
+  // stream: first token of the text, if it is a known stream or PPP station
   int end = 0;
   while (end < msg.size() && msg[end] != ':' && msg[end] != ' ' && msg[end] != '(') {
@@ -107 +107 @@
   if (end > 0) {
     QByteArray token = msg.left(end);
-    QMutexLocker locker(&stationMutex);
-    if (stations.contains(token)) {
-      rec._station = token;
+    QMutexLocker locker(&streamMutex);
+    if (streams.contains(token)) {
+      rec._stream = token;
     }
   }
@@ -136 +136 @@
 }
 
+// Plain text message with an explicit level
+////////////////////////////////////////////////////////////////////////////
+t_logRecord t_logRecord::message(e_level level, const QByteArray& msg,
+                                 const QByteArray& component) {
+  t_logRecord rec = fromMessage(msg, component);
+  rec._level = level;
+  return rec;
+}
+
+// Message of a BNC_DEBUG_* build
+////////////////////////////////////////////////////////////////////////////
+t_logRecord t_logRecord::debugMessage(const QByteArray& component, const QByteArray& msg) {
+  t_logRecord rec = fromMessage(msg, component);
+  rec._level = debug;
+  return rec;
+}
+
 //
 ////////////////////////////////////////////////////////////////////////////
@@ -196 +213 @@
 const char* t_logRecord::levelString(e_level level) {
   switch (level) {
+    case debug:   return "debug";
     case warning: return "warning";
     case error:   return "error";
@@ -210 +228 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void t_logRecord::registerStation(const QByteArray& station) {
-  if (station.isEmpty()) {
+t_logRecord::e_level t_logRecord::levelFromString(const QString& str) {
+  QString ss = str.trimmed().toLower();
+  if (ss == "info")    return info;
+  if (ss == "warning") return warning;
+  if (ss == "error")   return error;
+  return debug;
+}
+
+//
+////////////////////////////////////////////////////////////////////////////
+void t_logRecord::registerStream(const QByteArray& stream) {
+  if (stream.isEmpty()) {
     return;
   }
-  QMutexLocker locker(&stationMutex);
-  stations.insert(station);
+  QMutexLocker locker(&streamMutex);
+  streams.insert(stream);
 }
 
@@ -242 +270 @@
   put("component", _component, true);
   put("event",     _event, true);
-  if (!_station.isEmpty()) {
-    put("station", _station, true);
+  if (!_stream.isEmpty()) {
+    put("stream", _stream, true);
   }
   all += _fields;