From f028ea059812346a066eae954f6341a728ed0149 Mon Sep 17 00:00:00 2001
From: Tim Stack <timothyshanestack@gmail.com>
Date: Tue, 9 Apr 2024 12:40:15 -0700
Subject: [PATCH] [journald] script tweaks

---
 src/scripts/journald-url-handler.lnav | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/scripts/journald-url-handler.lnav b/src/scripts/journald-url-handler.lnav
index 34f7b91f..9ffc2e23 100644
--- a/src/scripts/journald-url-handler.lnav
+++ b/src/scripts/journald-url-handler.lnav
@@ -7,15 +7,17 @@
     jget(url, '/scheme') AS jscheme,
     jget(url, '/host') AS jhost,
     jget(url, '/parameters') as jparams
-    FROM (SELECT parse_url(
-              CASE WHEN regexp('^journald://(?:\?|$)', $1) THEN
-                  'journald://localhost/' || substr($1, 11)
-              END) AS url
-    )
+    FROM (SELECT parse_url($1) AS url)
 
 ;SELECT
-    printf(':sh journalctl --output=json -f %s', (
-        SELECT group_concat(
+    printf(':sh journalctl --output=json -f %s %s # %s',
+        CASE $jhost
+            WHEN 'localhost' THEN
+                ''
+            ELSE
+                '-m ' || $jhost
+        END,
+        (SELECT group_concat(
             CASE length(key)
                 WHEN 1 THEN
                     '-'
@@ -26,7 +28,8 @@
             '=' || value,
             ' ')
             FROM json_each($jparams)
-        )
+        ),
+        parse_url($1)
     ) AS cmds
 
 :eval ${cmds}