Changeset 11190 in ntrip for trunk/BNC/tests

Timestamp:

Nov 10, 2026, 9:21:30 AM (17 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

@@ -9 +9 @@
 '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();
+prefix and trailing blanks, 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
@@ -77 +77 @@
 }
 
+SHORT_MSG = {"ppp_position": "PPP position", "stream_latency": "Latency"}
+
 
 def matches(r, line):
@@ -84 +86 @@
     mp, msg, ev = r.get("mp"), r.get("msg"), r.get("event")
     if ev in SHORT:
-        return line.startswith(SHORT[ev](r))
+        return msg == SHORT_MSG[ev] and 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 msg == "Received message" and \
+        return msg == "Received RTCM 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:]
+    line = line.rstrip(" ")
     if ev.startswith("stream_outage_") or ev.startswith("stream_corrupted_"):
         return line.startswith(msg + " ")