From: Mike Yuan <me@yhndnzj.com>
Date: Tue, 13 May 2025 20:56:02 +0000 (+0200)
Subject: journalctl-show: report VARLINKERROR=
X-Git-Tag: v258-rc1~627^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c49c2477a441cc36904bec51926d05093ce398c6;p=thirdparty%2Fsystemd.git

journalctl-show: report VARLINKERROR=

Who knows, maybe one day we'd support spawning journalctl
as varlink socket-activatable service, where this bit of
info would help.
---

diff --git a/src/journal/journalctl-show.c b/src/journal/journalctl-show.c
index 20b39da62de..eac93b222d4 100644
--- a/src/journal/journalctl-show.c
+++ b/src/journal/journalctl-show.c
@@ -350,8 +350,10 @@ static int on_synchronize_reply(
 
         assert(vl);
 
-        if (error_id)
+        if (error_id) {
                 log_warning("Failed to synchronize on Journal, ignoring: %s", error_id);
+                (void) sd_notifyf(/* unset_environment= */ false, "VARLINKERROR=%s", error_id);
+        }
 
         r = show_and_fflush(c);
         if (r < 0)
@@ -377,7 +379,7 @@ static int on_signal(sd_event_source *s, const struct signalfd_siginfo *si, void
 
         r = varlink_connect_journal(&vl);
         if (r < 0) {
-                log_error_errno(r, "Failed to connect to Journal Varlink IPC interface, ignoring: %m");
+                log_error_errno(r, "Failed to connect to Journal Varlink IPC interface, skipping synchronization: %m");
                 goto finish;
         }