]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core-varlink: do not log about ENOENT if oomd isn't available
authorMike Yuan <me@yhndnzj.com>
Tue, 23 Jul 2024 15:06:57 +0000 (17:06 +0200)
committerMike Yuan <me@yhndnzj.com>
Tue, 23 Jul 2024 17:38:58 +0000 (19:38 +0200)
This is simply too noisy, since every invocation of
manager_varlink_send_managed_oom_update() would try to
connect to oomd if not already.

src/core/core-varlink.c

index 9051ab311145f5aab3247d3bb696bd898cc5edaa..93dfdd2e2665237c7689def69596fdd12d75c3bc 100644 (file)
@@ -626,13 +626,14 @@ static int manager_varlink_init_user(Manager *m) {
                 return 0;
 
         r = sd_varlink_connect_address(&link, VARLINK_ADDR_PATH_MANAGED_OOM_USER);
-        if (r < 0) {
-                if (r == -ENOENT || ERRNO_IS_DISCONNECT(r)) {
-                        log_debug("systemd-oomd varlink unix socket not found, skipping user manager varlink setup");
-                        return 0;
-                }
-                return log_error_errno(r, "Failed to connect to %s: %m", VARLINK_ADDR_PATH_MANAGED_OOM_USER);
+        if (r == -ENOENT)
+                return 0;
+        if (ERRNO_IS_NEG_DISCONNECT(r)) {
+                log_debug_errno(r, "systemd-oomd varlink socket isn't available, skipping user manager varlink setup: %m");
+                return 0;
         }
+        if (r < 0)
+                return log_error_errno(r, "Failed to connect to '%s': %m", VARLINK_ADDR_PATH_MANAGED_OOM_USER);
 
         sd_varlink_set_userdata(link, m);