SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logind: use log_warning_errno() return value where we can

Browse Source 
Also, change a couple of log error levels to LOG_WARNING, where we
encounter an error but then end up ignoring it.
This commit is contained in:
Lennart Poettering
2019-07-23 16:08:06 +02:00
parent 61c6e8e49c
commit 20fff3de75
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/login/logind.c
+5 -11
View File
@@ -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;
}