From: Mike Yuan <me@yhndnzj.com>
Date: Tue, 23 Jul 2024 15:06:57 +0000 (+0200)
Subject: core-varlink: do not log about ENOENT if oomd isn't available
X-Git-Tag: v257-rc1~827^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ff91850a5ae783dc70416025908b4eac211c199;p=thirdparty%2Fsystemd.git

core-varlink: do not log about ENOENT if oomd isn't available

This is simply too noisy, since every invocation of
manager_varlink_send_managed_oom_update() would try to
connect to oomd if not already.
---

diff --git a/src/core/core-varlink.c b/src/core/core-varlink.c
index 9051ab31114..93dfdd2e266 100644
--- a/src/core/core-varlink.c
+++ b/src/core/core-varlink.c
@@ -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);