From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 1 Jun 2021 08:00:01 +0000 (+0200)
Subject: varlink: remove duplicated "varlink:" prefix
X-Git-Tag: v249-rc1~110^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=953394e3bb1f1ead3c1d80237b97b71835b0755a;p=thirdparty%2Fsystemd.git

varlink: remove duplicated "varlink:" prefix

We had:

systemd[1]: varlink-36: New incoming message: {"method":"io.systemd.UserDatabase.GetMemberships","parameters":{"userName":"gdm","service":"io.systemd.DynamicUser"},"more":true}
systemd[1]: varlink-36: varlink: changing state idle-server → processing-method-more
systemd[1]: varlink-36: Sending message: {"error":"io.systemd.UserDatabase.NoRecordFound","parameters":{}}
systemd[1]: varlink-36: varlink: changing state processing-method-more → processed-method
systemd[1]: varlink-36: varlink: changing state processed-method → idle-server
systemd[1]: varlink-36: Got POLLHUP from socket.
systemd[1]: varlink-36: varlink: changing state idle-server → pending-disconnect
systemd[1]: varlink-36: varlink: changing state pending-disconnect → processing-disconnect
systemd[1]: varlink-36: varlink: changing state processing-disconnect → disconnected

So let's drop the "varlink:" prefix and use capitalized sentences like in other messages.
---

diff --git a/src/shared/varlink.c b/src/shared/varlink.c
index 2542d90668d..6b0b343ae92 100644
--- a/src/shared/varlink.c
+++ b/src/shared/varlink.c
@@ -233,10 +233,10 @@ static void varlink_set_state(Varlink *v, VarlinkState state) {
         assert(state >= 0 && state < _VARLINK_STATE_MAX);
 
         if (v->state < 0)
-                varlink_log(v, "varlink: setting state %s",
+                varlink_log(v, "Setting state %s",
                             varlink_state_to_string(state));
         else
-                varlink_log(v, "varlink: changing state %s → %s",
+                varlink_log(v, "Changing state %s → %s",
                             varlink_state_to_string(v->state),
                             varlink_state_to_string(state));