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

Timestamp:

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

Author:

stuerze

Message:

Structured logging improved

File:

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

trunk/BNC/src/bncwindow.cpp

@@ -207 +207 @@
     _logFormatStructuredComboBox->setCurrentIndex(kLogFmt);
   }
+  _logLevelStructuredComboBox = new QComboBox();
+  _logLevelStructuredComboBox->setEditable(false);
+  _logLevelStructuredComboBox->addItems(QString("debug,info,warning,error").split(","));
+  int kLogLev = _logLevelStructuredComboBox->findText(settings.value("logLevelStructured").toString());
+  if (kLogLev != -1) {
+    _logLevelStructuredComboBox->setCurrentIndex(kLogLev);
+  }
   _rawOutFileLineEdit = new QLineEdit(settings.value("rawOutFile").toString());
   _ephMountLineEdit = new QLineEdit(settings.value("ephMount").toString());
@@ -855 +862 @@
   gLayout->addWidget(_logFileLineEdit, 1, 1, 1, 20);
   gLayout->addWidget(new QLabel("Structured logfile"), 2, 0);
-  gLayout->addWidget(_logFileStructuredLineEdit, 2, 1, 1, 15);
-  gLayout->addWidget(new QLabel("  Format"), 2, 16, Qt::AlignRight);
-  gLayout->addWidget(_logFormatStructuredComboBox, 2, 17, 1, 4);
+  gLayout->addWidget(_logFileStructuredLineEdit, 2, 1, 1, 10);
+  gLayout->addWidget(new QLabel("  Format"), 2, 11, Qt::AlignRight);
+  gLayout->addWidget(_logFormatStructuredComboBox, 2, 12, 1, 3);
+  gLayout->addWidget(new QLabel("  Min. level"), 2, 15, Qt::AlignRight);
+  gLayout->addWidget(_logLevelStructuredComboBox, 2, 16, 1, 5);
   gLayout->addWidget(new QLabel("Append files"), 3, 0);
   gLayout->addWidget(_rnxAppendCheckBox, 3, 1);
@@ -1580 +1589 @@
   // ------------------
   _logFileLineEdit->setWhatsThis(tr("<p>Records of BNC's activities are shown in the 'Log' tab on the bottom of this window. They can be saved into a file when a valid path for that is specified in the 'Logfile (full path)' field.</p><p>The logfile name will automatically be extended by a string '_YYMMDD' carrying the current date. <i>[key: logFile]</i></p>"));
-  _logFileStructuredLineEdit->setWhatsThis(tr("<p>In addition to the logfile, BNC can write the same records as a structured logfile for log processing tools: one record per line, either JSON (JSON Lines) or logfmt (key=value pairs separated by blanks). Each record carries the time in UTC ('time', ISO 8601 with 'Z') and in GPS time ('gpst'), a level (info, warning, error), the component (e.g. stream, ppp), the event (e.g. ppp_position, stream_outage_begin), the station if known, the event's fields, the text of the classic logfile ('msg') and the record version ('v').</p><p>Messages without own event are written with component 'bnc' and event 'message'; their level is derived from keywords of the text. The logfile itself remains unchanged.</p><p>The file name will automatically be extended by a string '_YYMMDD' carrying the current date. Default is an empty option field, meaning that no structured logfile is written. <i>[key: logFileStructured]</i></p>"));
+  _logFileStructuredLineEdit->setWhatsThis(tr("<p>In addition to the logfile, BNC can write the same records as a structured logfile for log processing tools: one record per line, either JSON (JSON Lines) or logfmt (key=value pairs separated by blanks). Each record carries the time in UTC ('time', ISO 8601 with 'Z') and in GPS time ('gpst'), a level (debug, info, warning, error), the component (e.g. stream, ppp, cmb), the event (e.g. ppp_position, stream_outage_begin), the stream (mountpoint) or PPP station if known, the event's fields, the text of the classic logfile ('msg') and the record version ('v').</p><p>Messages without own event are written with event 'message' and the component of their origin; their level is error (a function does not work), warning (data or configuration problem, BNC continues) or info (status). The logfile itself remains unchanged.</p><p>The file name will automatically be extended by a string '_YYMMDD' carrying the current date. Default is an empty option field, meaning that no structured logfile is written. <i>[key: logFileStructured]</i></p>"));
   _logFormatStructuredComboBox->setWhatsThis(tr("<p>Select the format of the structured logfile: 'json' for one JSON object per line (JSON Lines), 'logfmt' for key=value pairs. Default is 'json'. <i>[key: logFormatStructured]</i></p>"));
+  _logLevelStructuredComboBox->setWhatsThis(tr("<p>Select the minimum level of the records written into the structured logfile: 'debug' writes all records (debug records exist only in BNC versions built with the BNC_DEBUG_* defines), 'info' leaves out the debug records, 'warning' writes warnings and errors only, 'error' errors only. The logfile is not affected. Default is 'debug'. <i>[key: logLevelStructured]</i></p>"));
   _rnxAppendCheckBox->setWhatsThis(tr("<p>When BNC is started, new files are created by default and file content already available under the same name will be overwritten. However, users might want to append already existing files following a regular restart or a crash of BNC or its platform.</p><p>Tick 'Append files' to continue with existing files and keep what has been recorded so far. <i>[key: rnxAppend]</i></p>"));
   _onTheFlyComboBox->setWhatsThis(tr("<p>When operating BNC online in 'no window' mode, some configuration parameters can be changed on-the-fly without interrupting the running process. For that BNC rereads parts of its configuration in pre-defined intervals. The default entry is 'no' that means the reread function is switched of. <p></p>Select '1 min', '5 min', '1 hour', or '1 day' to force BNC to reread its configuration every full minute, five minutes, hour, or day and let in between edited configuration options become effective on-the-fly without terminating uninvolved threads.</p><p>Note that when operating BNC in window mode, on-the-fly changeable configuration options become effective immediately via button 'Save & Reread Configuration'. <i>[key: onTheFlyInterval]</i></p>"));
@@ -1897 +1907 @@
   delete _logFileStructuredLineEdit;
   delete _logFormatStructuredComboBox;
+  delete _logLevelStructuredComboBox;
   delete _rawOutFileLineEdit;
   delete _ephMountLineEdit;
@@ -2432 +2443 @@
   settings.setValue("logFileStructured", _logFileStructuredLineEdit->text());
   settings.setValue("logFormatStructured", _logFormatStructuredComboBox->currentText());
+  settings.setValue("logLevelStructured", _logLevelStructuredComboBox->currentText());
   settings.setValue("rnxAppend", _rnxAppendCheckBox->checkState());
   settings.setValue("onTheFlyInterval", _onTheFlyComboBox->currentText());
@@ -2568 +2580 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotGetThreadsFinished() {
-  BNC_CORE->slotMessage("All Get Threads Terminated", true);
+  BNC_CORE->message("All Get Threads Terminated", true, "bnc", t_logRecord::info);
   delete _caster;    _caster = 0; BNC_CORE->setCaster(0);
   delete _casterEph; _casterEph = 0;
@@ -2638 +2650 @@
   connect(_caster, SIGNAL(mountPointsRead(QList<bncGetThread*>)), this, SLOT(slotMountPointsRead(QList<bncGetThread*>)));
 
-  BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " (" BNC_OS ") ==========", true);
+  BNC_CORE->message("========== Start BNC v" BNCVERSION " (" BNC_OS ") ==========", true, "bnc", t_logRecord::info);
 
   bncSettings settings;
@@ -2645 +2657 @@
   // -------------
   if (!_rnxPathLineEdit->text().isEmpty())
-    BNC_CORE->slotMessage("Panel 'RINEX Observations' active", true);
+    BNC_CORE->message("Panel 'RINEX Observations' active", true, "bnc", t_logRecord::info);
   if (!_ephPathLineEdit->text().isEmpty())
-    BNC_CORE->slotMessage("Panel 'RINEX Ephemeris' active", true);
+    BNC_CORE->message("Panel 'RINEX Ephemeris' active", true, "bnc", t_logRecord::info);
   if (!_corrPathLineEdit->text().isEmpty())
-    BNC_CORE->slotMessage("Panel 'Broadcast Corrections' active", true);
+    BNC_CORE->message("Panel 'Broadcast Corrections' active", true, "bnc", t_logRecord::info);
   if (!_outPortLineEdit->text().isEmpty())
-    BNC_CORE->slotMessage("Panel 'Feed Engine' active", true);
+    BNC_CORE->message("Panel 'Feed Engine' active", true, "bnc", t_logRecord::info);
   if (!_serialMountPointLineEdit->text().isEmpty())
-    BNC_CORE->slotMessage("Panel 'Serial Output' active", true);
+    BNC_CORE->message("Panel 'Serial Output' active", true, "bnc", t_logRecord::info);
   if (!_adviseObsRateComboBox->currentText().isEmpty())
-    BNC_CORE->slotMessage("Panel 'Outages' active", true);
+    BNC_CORE->message("Panel 'Outages' active", true, "bnc", t_logRecord::info);
   if (!_miscMountLineEdit->text().isEmpty())
-    BNC_CORE->slotMessage("Panel 'Miscellaneous' active", true);
+    BNC_CORE->message("Panel 'Miscellaneous' active", true, "bnc", t_logRecord::info);
   if (_pppWidgets._dataSource->currentText() == "Real-Time Streams")
-    BNC_CORE->slotMessage("Panel 'PPP' active", true);
+    BNC_CORE->message("Panel 'PPP' active", true, "bnc", t_logRecord::info);
   if (_cmbTable->rowCount() > 0)
-    BNC_CORE->slotMessage("Panel 'Combine Corrections' active", true);
+    BNC_CORE->message("Panel 'Combine Corrections' active", true, "bnc", t_logRecord::info);
   if (_uploadTable->rowCount() > 0)
-    BNC_CORE->slotMessage("Panel 'Upload Corrections' active", true);
+    BNC_CORE->message("Panel 'Upload Corrections' active", true, "bnc", t_logRecord::info);
   if (_uploadEphTable->rowCount() > 0)
-    BNC_CORE->slotMessage("Panel 'UploadEphemeris' active", true);
+    BNC_CORE->message("Panel 'UploadEphemeris' active", true, "bnc", t_logRecord::info);
 
   QDir rnxdir(settings.value("rnxPath").toString());
-  if (!rnxdir.exists()) BNC_CORE->slotMessage("Cannot find RINEX Observations directory", true);
+  if (!rnxdir.exists()) BNC_CORE->message("Cannot find RINEX Observations directory", true, "bnc", t_logRecord::error);
 
   QString rnx_file = settings.value("rnxScript").toString();
   if (!rnx_file.isEmpty()) {
     QFile rnxfile(settings.value("rnxScript").toString());
-    if (!rnxfile.exists()) BNC_CORE->slotMessage("Cannot find RINEX Observations script", true);
+    if (!rnxfile.exists()) BNC_CORE->message("Cannot find RINEX Observations script", true, "bnc", t_logRecord::error);
   }
 
   QDir ephdir(settings.value("ephPath").toString());
-  if (!ephdir.exists()) BNC_CORE->slotMessage("Cannot find RINEX Ephemeris directory", true);
+  if (!ephdir.exists()) BNC_CORE->message("Cannot find RINEX Ephemeris directory", true, "bnc", t_logRecord::error);
 
   QDir corrdir(settings.value("corrPath").toString());
-  if (!corrdir.exists()) BNC_CORE->slotMessage("Cannot find Broadcast Corrections directory", true);
+  if (!corrdir.exists()) BNC_CORE->message("Cannot find Broadcast Corrections directory", true, "bnc", t_logRecord::error);
 
   QString advise_file = settings.value("adviseScript").toString();
   if (!advise_file.isEmpty()) {
     QFile advisefile(settings.value("adviseScript").toString());
-    if (!advisefile.exists()) BNC_CORE->slotMessage("Cannot find Outages script", true);
+    if (!advisefile.exists()) BNC_CORE->message("Cannot find Outages script", true, "bnc", t_logRecord::error);
   }