From 77740b5993b9e6e000ca8378a67338931c35b506 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 10 May 2019 09:57:59 +0200 Subject: [PATCH] journalctl: improve error messages Follow-up for #12230. --- src/journal/journalctl.c | 6 ++++-- src/shared/varlink.c | 11 ++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index c2f967cef71..88ee4ee35f6 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1949,11 +1949,13 @@ static int simple_varlink_call(const char *option, const char *method) { r = varlink_connect_address(&link, "/run/systemd/journal/io.systemd.journal"); if (r < 0) - return log_error_errno(r, "Failed to connect to journal: %m"); + return log_error_errno(r, "Failed to connect to /run/systemd/journal/io.systemd.journal: %m"); + + (void) varlink_set_description(link, "journal"); r = varlink_call(link, method, NULL, NULL, &error, NULL); if (r < 0) - return log_error_errno(r, "Failed to execute operation: %s", error); + return log_error_errno(r, "Failed to execute varlink call: %s", error); return 0; } diff --git a/src/shared/varlink.c b/src/shared/varlink.c index ceec1af0d4d..5c5f5077f9b 100644 --- a/src/shared/varlink.c +++ b/src/shared/varlink.c @@ -228,10 +228,15 @@ static inline const char *varlink_server_description(VarlinkServer *s) { static void varlink_set_state(Varlink *v, VarlinkState state) { assert(v); + assert(state >= 0 && state < _VARLINK_STATE_MAX); - varlink_log(v, "varlink: changing state %s → %s", - varlink_state_to_string(v->state), - varlink_state_to_string(state)); + if (v->state < 0) + varlink_log(v, "varlink: setting state %s", + varlink_state_to_string(state)); + else + varlink_log(v, "varlink: changing state %s → %s", + varlink_state_to_string(v->state), + varlink_state_to_string(state)); v->state = state; } -- 2.47.3