From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 23 Jul 2019 08:17:46 +0000 (+0200)
Subject: logind: use log_warning_errno() return value where we can
X-Git-Tag: v243-rc1~56^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20fff3de756e176c54a310a24061b87b73115d8e;p=thirdparty%2Fsystemd.git

logind: use log_warning_errno() return value where we can

Also, change a couple of log error levels to LOG_WARNING, where we
encounter an error but then end up ignoring it.
---

diff --git a/src/login/logind.c b/src/login/logind.c
index f4bc1d2eb73..ebdc0965c12 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -295,10 +295,8 @@ static int manager_enumerate_linger_users(Manager *m) {
                         continue;
 
                 k = manager_add_user_by_name(m, de->d_name, NULL);
-                if (k < 0) {
-                        log_notice_errno(k, "Couldn't add lingering user %s: %m", de->d_name);
-                        r = k;
-                }
+                if (k < 0)
+                        r = log_warning_errno(k, "Couldn't add lingering user %s, ignoring: %m", de->d_name);
         }
 
         return r;
@@ -331,9 +329,7 @@ static int manager_enumerate_users(Manager *m) {
 
                 k = manager_add_user_by_name(m, de->d_name, &u);
                 if (k < 0) {
-                        log_error_errno(k, "Failed to add user by file name %s: %m", de->d_name);
-
-                        r = k;
+                        r = log_warning_errno(k, "Failed to add user by file name %s, ignoring: %m", de->d_name);
                         continue;
                 }
 
@@ -486,8 +482,7 @@ static int manager_enumerate_sessions(Manager *m) {
 
                 k = manager_add_session(m, de->d_name, &s);
                 if (k < 0) {
-                        log_error_errno(k, "Failed to add session by file name %s: %m", de->d_name);
-                        r = k;
+                        r = log_warning_errno(k, "Failed to add session by file name %s, ignoring: %m", de->d_name);
                         continue;
                 }
 
@@ -529,8 +524,7 @@ static int manager_enumerate_inhibitors(Manager *m) {
 
                 k = manager_add_inhibitor(m, de->d_name, &i);
                 if (k < 0) {
-                        log_notice_errno(k, "Couldn't add inhibitor %s: %m", de->d_name);
-                        r = k;
+                        r = log_warning_errno(k, "Couldn't add inhibitor %s, ignoring: %m", de->d_name);
                         continue;
                 }