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

Timestamp:

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

Author:

stuerze

Message:

Structured logging improved

File:

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

trunk/BNC/src/bnccaster.cpp

@@ -64 +64 @@
   bncSettings settings;
 
-  connect(this, SIGNAL(newMessage(QByteArray,bool)),
-          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
+  BNC_CORE->connectMessages(this, "bnc");
+  BNC_CORE->connectLogRecords(this, "bnc");
 
   _outFile = 0;
@@ -81 +81 @@
                       + QByteArray::number(port) + ": "
                       + _server->errorString();
-      emit newMessage(message.toLatin1(), true);
+      emit newLogRecord(t_logRecord::message(t_logRecord::error, message.toLatin1()), true);
     }
     connect(_server, SIGNAL(newConnection()), this, SLOT(slotNewConnection()));
@@ -99 +99 @@
                       + QByteArray::number(uPort) + ": "
                       + _uServer->errorString();
-      emit newMessage(message.toLatin1(), true);
+      emit newLogRecord(t_logRecord::message(t_logRecord::error, message.toLatin1()), true);
     }
     connect(_uServer, SIGNAL(newConnection()), this, SLOT(slotNewUConnection()));
@@ -128 +128 @@
                       + QByteArray::number(_miscPort) + ": "
                       + _miscServer->errorString();
-      emit newMessage(message.toLatin1(), true);
+      emit newLogRecord(t_logRecord::message(t_logRecord::error, message.toLatin1()), true);
     }
     connect(_miscServer, SIGNAL(newConnection()), this, SLOT(slotNewMiscConnection()));
@@ -235 +235 @@
         if ( !settings.value("outFile").toString().isEmpty() ||
              !settings.value("outPort").toString().isEmpty() ) {
-          emit( newMessage(QString("%1: Old or erroneous observation epoch %2 thrown away from %3")
+          emit newLogRecord(t_logRecord::message(t_logRecord::warning, QString("%1: Old or erroneous observation epoch %2 thrown away from %3")
                            .arg(staID.data())
                            .arg(string(obs._time).c_str())
                            .arg(obs._prn.toString().c_str())
-                             .toLatin1(), true) );
+                             .toLatin1()), true);
         }
       }
@@ -262 +262 @@
 void bncCaster::slotNewConnection() {
   _sockets->push_back( _server->nextPendingConnection() );
-  emit( newMessage(QString("New client connection on sync port: # %1")
-                   .arg(_sockets->size()).toLatin1(), true) );
+  emit newLogRecord(t_logRecord::message(t_logRecord::info, QString("New client connection on sync port: # %1")
+                   .arg(_sockets->size()).toLatin1()), true);
 }
 
 void bncCaster::slotNewUConnection() {
   _uSockets->push_back( _uServer->nextPendingConnection() );
-  emit( newMessage(QString("New client connection on usync port: # %1")
-                   .arg(_uSockets->size()).toLatin1(), true) );
+  emit newLogRecord(t_logRecord::message(t_logRecord::info, QString("New client connection on usync port: # %1")
+                   .arg(_uSockets->size()).toLatin1()), true);
 }
 
@@ -318 +318 @@
   }
   _staIDs.removeAll(staID);
-  emit( newMessage(
-           QString("Decoding %1 stream(s)").arg(_staIDs.size()).toLatin1(), true) );
+  emit newLogRecord(t_logRecord::message(t_logRecord::info, QString("Decoding %1 stream(s)").arg(_staIDs.size()).toLatin1()), true);
   if (_staIDs.size() == 0) {
     emit getThreadsFinished();
@@ -482 +481 @@
 
   emit mountPointsRead(_threads);
-  emit(newMessage(QString("Configuration read: " + BNC_CORE->confFileName() + ", %1 stream(s)").arg(_threads.count()).toLatin1(), true));
+  emit newLogRecord(t_logRecord::message(t_logRecord::info, QString("Configuration read: " + BNC_CORE->confFileName() + ", %1 stream(s)").arg(_threads.count()).toLatin1()), true);
 
   // (Re-) Start the configuration timer
@@ -586 +585 @@
 void bncCaster::slotNewMiscConnection() {
   _miscSockets->push_back( _miscServer->nextPendingConnection() );
-  emit( newMessage(QString("New client connection on Miscellaneous Output Port: # %1")
-                   .arg(_miscSockets->size()).toLatin1(), true) );
+  emit newLogRecord(t_logRecord::message(t_logRecord::info, QString("New client connection on Miscellaneous Output Port: # %1")
+                   .arg(_miscSockets->size()).toLatin1()), true);
 }