From f35e9b101d80c05d5a5eaece6e62e8eeb5743691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 1 Jun 2021 09:55:09 +0200 Subject: [PATCH] varlink: say "varlink:" instead of "n/a:" when no description is available For new connections, we log something like this: systemd[1]: n/a: New incoming connection. systemd[1]: n/a: Connections of user 997: 0 (of 1024 max) systemd[1]: varlink-22: varlink: setting state idle-server systemd[1]: varlink-22: New incoming message: ... This "n/a" is not very pretty, and without context it would be hard to even figure out this is a varlink connection. --- src/shared/varlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/varlink.c b/src/shared/varlink.c index e77b144779..2542d90668 100644 --- a/src/shared/varlink.c +++ b/src/shared/varlink.c @@ -221,11 +221,11 @@ DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(varlink_state, VarlinkState); log_debug("%s: " fmt, varlink_server_description(s), ##__VA_ARGS__) static inline const char *varlink_description(Varlink *v) { - return strna(v ? v->description : NULL); + return (v ? v->description : NULL) ?: "varlink"; } static inline const char *varlink_server_description(VarlinkServer *s) { - return strna(s ? s->description : NULL); + return (s ? s->description : NULL) ?: "varlink"; } static void varlink_set_state(Varlink *v, VarlinkState state) {