[formats] update fsck_log

tstack · tstack · commit dd3abb5443f1 · 2026-04-14T19:54:31.000-07:00
diff --git a/NEWS.md b/NEWS.md
@@ -10,6 +10,22 @@ Features:
   The `z`/`Z` keys can also be used to increase/decrease the
   context by one in the LOG, TEXT, and TIMELINE views.  Context
   lines are styled using the new `context-line` theme style.
+* Added a log format for the `fsck_apfs` and `fsck_hfs` tools on
+  macOS, covering both the `started`/`completed` lifecycle lines
+  and legacy `run` entries.  This replaces the previous
+  `fsck_hfs_log` format, which only matched the start lines.
+  The new format exposes `device`, `tool`, and `action` fields,
+  groups messages by device in the TIMELINE view, and highlights
+  `error:` lines and `FILESYSTEM CLEAN` status messages.
+
+Breaking changes:
+* File-size values can now be written with the IEC binary
+  prefixes (`KiB`, `MiB`, `GiB`, ...) for 1024-based units.
+  The existing `KB`/`MB`/... forms now follow the strict SI
+  convention (1000-based), so scripts that depended on the
+  informal 1024 meaning for SI prefixes should be updated to
+  use the `i` suffix.  The `humanize::file_size()` formatter
+  likewise emits SI-based `KB`/`MB`/... output.
 
 ## lnav v0.14.0
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -200,7 +200,7 @@ set(FORMAT_FILES
         formats/engine_log.json
         formats/error_log.json
         formats/esx_syslog_log.json
-        formats/fsck_hfs_log.json
+        formats/fsck_log.json
         formats/github_events_log.json
         formats/glog_log.json
         formats/haproxy_log.json
diff --git a/src/formats/formats.am b/src/formats/formats.am
@@ -17,7 +17,7 @@ FORMAT_FILES = \
     $(srcdir)/%reldir%/env_logger_log.json \
     $(srcdir)/%reldir%/error_log.json \
     $(srcdir)/%reldir%/esx_syslog_log.json \
-    $(srcdir)/%reldir%/fsck_hfs_log.json \
+    $(srcdir)/%reldir%/fsck_log.json \
     $(srcdir)/%reldir%/github_events_log.json \
     $(srcdir)/%reldir%/glog_log.json \
     $(srcdir)/%reldir%/haproxy_log.json \
diff --git a/src/formats/fsck_hfs_log.json b/src/formats/fsck_hfs_log.json
diff --git a/src/formats/fsck_log.json b/src/formats/fsck_log.json
@@ -0,0 +1,52 @@
+{
+    "$schema": "https://lnav.org/schemas/format-v1.schema.json",
+    "fsck_log": {
+        "title": "Fsck Log",
+        "description": "Log format for the fsck_apfs and fsck_hfs tools on Mac OS X.",
+        "regex": {
+            "std": {
+                "pattern": "^(?<device>[^:]+): (?<tool>fsck_apfs|fsck_hfs) (?<action>run|started|completed) at (?<timestamp>\\S{3,8} \\S{3,8}\\s+\\d{1,2} \\d{2}:\\d{2}:\\d{2} \\d{4})(?<body>.*)"
+            }
+        },
+        "opid-field": "device",
+        "value": {
+            "device": {
+                "kind": "string",
+                "identifier": true
+            },
+            "tool": {
+                "kind": "string",
+                "identifier": true
+            },
+            "action": {
+                "kind": "string",
+                "identifier": true
+            }
+        },
+        "highlights": {
+            "error": {
+                "pattern": "\\berror:.*",
+                "color": "#ef5350",
+                "underline": false
+            },
+            "clean": {
+                "pattern": "\\bFILESYSTEM CLEAN\\b",
+                "color": "#22da6e"
+            }
+        },
+        "sample": [
+            {
+                "line": "/dev/rdisk0s2: fsck_hfs run at Wed Jul 25 23:01:18 2012"
+            },
+            {
+                "line": "/dev/rdisk2s1: fsck_apfs started at Tue Mar  3 17:38:59 2026"
+            },
+            {
+                "line": "/dev/rdisk2s1: fsck_apfs completed at Tue Mar  3 17:38:59 2026"
+            },
+            {
+                "line": "/dev/rdisk4s1: fsck_hfs completed at Wed Mar  4 08:03:33 2026"
+            }
+        ]
+    }
+}
