dilim/systemd
1
0 Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-11-06 05:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd-journal: log correct errors

Browse Source 
fd_nonblock() returns a negative errno; the message used errno, and the
stale value was also recorded for the file and returned.

Also 'r' was set in a roundabout way in a few cases, simplify those.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek committed 2026-11-04 00:27:28 +01:00
1 parent 0bd0b43836
commit cb4cc16965
1 file changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-journal/sd-journal.c
+7 -6
View File
@@ -1662,21 +1662,22 @@ static int add_any_file(
r = fd_nonblock(fd, /* nonblock= */ false);
if (r < 0) {
r = log_debug_errno(errno, "Failed to turn off O_NONBLOCK for %s: %m", path);
log_debug_errno(r, "Failed to turn off O_NONBLOCK for %s: %m", path);
goto error;
}
r = fd_get_path(fd, &resolved_path);
if (r < 0) {
r = log_debug_errno(r, "Failed to resolve path '%s': %m", path);
log_debug_errno(r, "Failed to resolve path '%s': %m", path);
goto error;
}
path = resolved_path;
}
if (fstat(fd, &st) < 0) {
r = log_debug_errno(errno, "Failed to fstat %s: %m", path ?: "fd");
r = RET_NERRNO(fstat(fd, &st));
if (r < 0) {
log_debug_errno(r, "Failed to fstat %s: %m", path ?: "fd");
goto error;
}
@@ -1710,8 +1711,8 @@ static int add_any_file(
}
if (ordered_hashmap_size(j->files) >= JOURNAL_FILES_MAX) {
r = log_debug_errno(SYNTHETIC_ERRNO(ETOOMANYREFS),
"Too many open journal files, not adding %s.", path ?: "fd");
log_debug("Too many open journal files, not adding %s.", path ?: "fd");
r = -ETOOMANYREFS;
goto error;
}