From 1e447cb52aa6a9bbd3cd97839d627316cce40d89 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Sat, 6 Jul 2024 15:26:15 -0700
Subject: [PATCH] also store raw log messages in the slog file.

---
 .vscode/launch.json     |  2 +-
 meshtastic/slog/slog.py | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index aac37db..85e35ba 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -204,7 +204,7 @@
       "request": "launch",
       "module": "meshtastic",
       "justMyCode": false,
-      "args": ["--slog", "--power-ppk2-meter", "--power-stress", "--power-voltage", "3.3", "--seriallog"]
+      "args": ["--slog", "--power-ppk2-meter", "--power-stress", "--power-voltage", "3.3", "--seriallog", "--ble"]
     },
     {
       "name": "meshtastic test",
diff --git a/meshtastic/slog/slog.py b/meshtastic/slog/slog.py
index 91c6350..1666055 100644
--- a/meshtastic/slog/slog.py
+++ b/meshtastic/slog/slog.py
@@ -110,7 +110,7 @@ class StructuredLogger:
     """Sniffs device logs for structured log messages, extracts those into apache arrow format.
     Also writes the raw log messages to raw.txt"""
 
-    def __init__(self, client: MeshInterface, dir_path: str) -> None:
+    def __init__(self, client: MeshInterface, dir_path: str, include_raw=True) -> None:
         """Initialize the StructuredLogger object.
 
         client (MeshInterface): The MeshInterface object to monitor.
@@ -123,6 +123,10 @@ class StructuredLogger:
             (lambda x, y: x + y), map(lambda x: x.fields, log_defs.values())
         )
 
+        self.include_raw = include_raw
+        if self.include_raw:
+            all_fields.append(("raw", pa.string()))
+
         self.writer.set_schema(pa.schema(all_fields))
 
         self.raw_file: Optional[
@@ -151,6 +155,9 @@ class StructuredLogger:
 
         line (str): the line of log output
         """
+
+        di = {}  # the dictionary of the fields we found to log
+
         m = log_regex.match(line)
         if m:
             src = m.group(1)
@@ -163,13 +170,18 @@ class StructuredLogger:
                 r = d.format.parse(args)  # get the values with the correct types
                 if r:
                     di = r.named
-                    di["time"] = datetime.now()
-                    self.writer.add_row(di)
                 else:
                     logging.warning(f"Failed to parse slog {line} with {d.format}")
             else:
                 logging.warning(f"Unknown Structured Log: {line}")
 
+        # Store our structured log record
+        if di or self.include_raw:
+            di["time"] = datetime.now()
+            if self.include_raw:
+                di["raw"] = line
+            self.writer.add_row(di)
+
         if self.raw_file:
             self.raw_file.write(line + "\n")  # Write the raw log