Changeset 11189 in ntrip for trunk/BNC/tests

Timestamp:

Nov 10, 2026, 8:45:57 AM (18 hours ago)

Author:

stuerze

Message:

Structured logging improved

Location:

trunk/BNC/tests

Files:

• cases/log_structured/expected/PPPQuickStart.jsonl.gz (modified) ( previous)
• cases/log_structured/expected/PPPQuickStart.logfmt.gz (modified) ( previous)
• tools/logcheck.py (modified) (3 diffs)

trunk/BNC/tests/tools/logcheck.py

@@ -7 +7 @@
 logfmt file a sequence of key=value pairs, that both carry the same records,
 that the records have the mandatory keys in the documented order (optional
-'epoch' after 'time', GPS Time without 'Z'), that the 'msg' of the records
-(for RTCM scan message types: 'mp', 'message_type', 'size') equals the text of
-the classic logfile line by line (classic lines without
-their "yy-mm-dd hh:mm:ss " prefix; the start line is skipped, it goes to the
-file of the current date) and that 'time' (UTC) is the GPS Time stamp of the
-classic line minus the GPS-UTC leap seconds. Prints a summary of the records per level,
-component and event; exit code 1 on any error.
+'epoch' after 'time', GPS Time without 'Z'), that the records belong line by
+line to the classic logfile ('msg' is the classic text without the "<mp>: "
+prefix, shortened for events whose fields carry the details, see matches();
+classic lines without their "yy-mm-dd hh:mm:ss " prefix; the start line is
+skipped, it goes to the file of the current date) and that 'time' (UTC) is the
+GPS Time stamp of the classic line minus the GPS-UTC leap seconds. Prints a
+summary of the records per level, component and event; exit code 1 on any
+error.
 """
 
@@ -70 +71 @@
 
 
-def classic_text(r):
-    """Text of the classic logfile line of a record: 'msg', except for the
-    message types of the RTCM scan, which carry the short text 'Received message'
-    and the details in their fields."""
-    if r.get("event") == "stream_content" and "message_type" in r:
-        if r["msg"] != "Received message":
-            return "unexpected msg %r" % r["msg"]
+# events with a short structured 'msg': prefix the classic line must start with
+SHORT = {
+    "ppp_position": lambda r: "%s %s X = " % (r["epoch"].replace("T", "_"), r["mp"]),
+    "stream_latency": lambda r: "%s %s: Mean latency " % (r["mp"], r["type"]),
+}
+
+
+def matches(r, line):
+    """Does the record belong to the classic logfile line? The structured 'msg'
+    is the classic text without the "<mp>: " prefix, shortened where the
+    fields carry the details."""
+    mp, msg, ev = r.get("mp"), r.get("msg"), r.get("event")
+    if ev in SHORT:
+        return line.startswith(SHORT[ev](r))
+    if ev == "stream_content" and "message_type" in r:
         size = " (size %d)" % r["size"] if "size" in r else " "
-        return "%s: Received message type %d%s" % (r["mp"], r["message_type"], size)
-    return r.get("msg")
+        return msg == "Received message" and \
+            line == "%s: Received message type %d%s" % (mp, r["message_type"], size)
+    if mp and line.startswith(mp + ": "):
+        line = line[len(mp) + 2:]
+    if ev.startswith("stream_outage_") or ev.startswith("stream_corrupted_"):
+        return line.startswith(msg + " ")
+    return msg == line
 
 
@@ -134 +148 @@
 
     body = [r for r in recs if "========== Start BNC" not in r.get("msg", "")]
-    msgs = [classic_text(r) for r in body]
     for k, (r, st) in enumerate(zip(body, stamps), 1):
         utc = datetime.datetime.strptime(r["time"], "%Y-%m-%dT%H:%M:%S.%fZ")
         if st is not None and (st - utc.replace(microsecond=0)).total_seconds() != LEAP_GPS_UTC:
             errors.append("record %d: time %s, classic %s" % (k, r["time"], st))
-    if msgs != classic:
-        for k, (a, b) in enumerate(zip(msgs, classic), 1):
-            if a != b:
-                errors.append("record %d: msg %r, classic %r" % (k, a, b))
-                break
-        else:
-            errors.append("%d records, %d classic lines" % (len(msgs), len(classic)))
+    for k, (r, line) in enumerate(zip(body, classic), 1):
+        if not matches(r, line):
+            errors.append("record %d: msg %r, classic %r" % (k, r.get("msg"), line))
+            break
+    if len(body) != len(classic):
+        errors.append("%d records, %d classic lines" % (len(body), len(classic)))
 
     print("%d records" % len(recs))