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

Timestamp:

Nov 9, 2026, 5:37:55 PM (less than one hour ago)

Author:

stuerze

Message:

Structured logging improved

File:

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

trunk/BNC/src/bnccore.cpp

@@ -43 +43 @@
 #include <QMessageBox>
 #include <cmath>
+#ifndef Q_OS_WIN
+#include <sys/stat.h>
+#endif
 
 #include "bnccore.h"
@@ -72 +75 @@
   _logStream   = 0;
   _logFileStructured  = 0;
+  _logStructuredInit  = false;
   _logFormatStructured = t_logRecord::json;
   _logLevelStructured  = t_logRecord::debug;
@@ -195 +199 @@
     delete _logStream; _logStream = 0;
     delete _logFile;   _logFile   = 0;
-    delete _logFileStructured; _logFileStructured = 0;
     _logFileFlag = 1;
     _fileDate = currDate;
@@ -214 +217 @@
       _logStream->setDevice(_logFile);
     }
-    QString structName = settings.value("logFileStructured").toString();
-    if ( !structName.isEmpty() ) {
-      expandEnvVar(structName);
+  }
+
+  // Structured logfile: one endless file (rotation by external tools)
+  // ---------------------------------------------------------------
+  if (!_logStructuredInit) {
+    _logStructuredInit = true;
+    bncSettings settings;
+    _logFileStructuredName = settings.value("logFileStructured").toString();
+    if (!_logFileStructuredName.isEmpty()) {
+      expandEnvVar(_logFileStructuredName);
       _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)
-                                           : QIODevice::WriteOnly)) {
-        delete _logFileStructured; _logFileStructured = 0;
-      }
-    }
+      openLogFileStructured();
+    }
+  }
+  else if (!_logFileStructuredName.isEmpty() && _logStructuredCheck.hasExpired(1000)) {
+    openLogFileStructured();   // reopens only if the file was moved or removed
   }
 
@@ -244 +253 @@
     _logFileStructured->write(rec.encode(_logFormatStructured, currDateTime) + "\n");
     _logFileStructured->flush();
+  }
+}
+
+// Open the structured logfile, or reopen it after an external rotation
+// (logrotate without copytruncate moves the file and the old one must be
+// released); always appending, also after copytruncate
+////////////////////////////////////////////////////////////////////////////
+void t_bncCore::openLogFileStructured() {
+  _logStructuredCheck.start();
+  if (_logFileStructured) {
+    bool same = _logFileStructured->exists();
+#ifndef Q_OS_WIN
+    if (same) {
+      struct stat stPath, stOpen;
+      same = (stat(QFile::encodeName(_logFileStructuredName).constData(), &stPath) == 0 &&
+              fstat(_logFileStructured->handle(), &stOpen) == 0 &&
+              stPath.st_dev == stOpen.st_dev && stPath.st_ino == stOpen.st_ino);
+    }
+#endif
+    if (same) {
+      return;
+    }
+    delete _logFileStructured; _logFileStructured = 0;
+  }
+  _logFileStructured = new QFile(_logFileStructuredName);
+  if (!_logFileStructured->open(QIODevice::WriteOnly | QIODevice::Append)) {
+    delete _logFileStructured; _logFileStructured = 0;
   }
 }